recovering file somehow undid the merge.