Solving Conflicts