Sorting out merge mayhem