Recovering from painful merge.