post-merge check1