added change password
conflict solve