fixed merge conflict typo