Fix typo in merging