decomposed the edit_profile for users
fixed merge conflicts in uesr edit