Fix merge conflicts typo