edit profile changes complete
merge