Typo while merging