using merge-recursive again for testing