changepassword setting
Resolved Conflict