post-merge check3