Clean up seriously broken merge