Screwed up merge cleanup