Fixing Mismerge