dao package merge