Merge conflict typo