User DAO
Just fixing merge conflicts