Recovering from the merge