fix a typo in the merge