merge cleanup should actually cleanup and the test should actually test

fix a bunch of stupid typos in merge cleanup