Undoing merge peculiarities