test post-merge