fixing unmerge issues