typo in merge