fixed merge conflicts on DAO