add test3
merge