post-merge check 7