Unbreak merge harder.