add edit profile view controller
merge conflict