WIP: recovering from bad merge.