add test
merge
change dao and domain