post-merge check 3