edit user profile password changed
merge changes