Merge userrole dao and update to the latest version