Solve Conflict