add test
merge