Fixed typo in merge