fix: merge develop

packages/medusa-plugin-mailchimp/CHANGELOG.md

@@ -3,11 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-<<<<<<< HEAD
 ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.7...medusa-plugin-mailchimp@1.1.8) (2021-04-13)
-=======
-## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.7...medusa-plugin-mailchimp@1.1.8) (2021-04-09)
->>>>>>> origin/develop
 
 **Note:** Version bump only for package medusa-plugin-mailchimp
 

packages/medusa-plugin-mailchimp/package.json

@@ -40,11 +40,7 @@
     "cors": "^2.8.5",
     "express": "^4.17.1",
     "mailchimp-api-v3": "^1.14.0",
-<<<<<<< HEAD
-    "medusa-core-utils": "^1.1.4",
-=======
     "medusa-core-utils": "^1.1.5",
->>>>>>> origin/develop
     "medusa-test-utils": "^1.1.8"
   },
   "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"