duo to merge the dao  & service
merge remote, confilt resolved