fatal: cannot do a partial commit during a merge.