Remove Merge Conflicts...