post-merge checking2