branch merge cleanup