some merge cleanup