Typo when merging