Test merge round 3