Cleaning up merge conflict markers