fix unmerge