Solve Merge Conflict