Merge and Solve Conflicts