post-merge checking5