updated mailchimp user and id
complete merge