Cleaning up merger problems