Added changes for profile update
fixed conflicts for merge