Fixed a typo in merge