Fix bug in merge