Fix typo in merge