rebuild post-merge