Undid the bad "merges"