Recover from bad merge.