merge cleanup 1