Handle can't-happen merge failures a bit better.