some post-merge cleanup