unbreak merge