Fix typo after merge conflict