unmerge fix