25. Solving Conflicts