change password
change password after remove conflict
change password after remove conflict