Removed some accidentally-left-in merge conflict markup from TestUserProfile.