devise
change password not working
changed roles to role
conflict resolve