add test case
merge