post-merge check5