post-merge  cleanup