Solve conflicts