Remove Merge Conflicts