modify *DaoImpl
merge