fix error DAO
fix conflict Users