post-merge checking3