fix merge with social-profiles branch