post merge cleanup