Fix merging typo