Remove mailchimp column and put it in view details instead
Fix merge conflict