post-merge check 2