fixed DAO merge issues