carbon2-commit: Recover from merge SNAFU.