added test
merge