made changes to user profile
conflicted resolved