making (almost) tests of merge api pass again