Finish EditProfile
merge