merge test part2