add a unit test
merge conflicts