oops, reverse merge