post-merge check16