fix: merge develop

packages/medusa-plugin-twilio-sms/CHANGELOG.md

@@ -3,7 +3,11 @@
 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-twilio-sms@1.1.7...medusa-plugin-twilio-sms@1.1.8) (2021-04-13)
+=======
+## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-twilio-sms@1.1.7...medusa-plugin-twilio-sms@1.1.8) (2021-04-09)
+>>>>>>> origin/develop
 
 **Note:** Version bump only for package medusa-plugin-twilio-sms
 

packages/medusa-plugin-twilio-sms/package.json

@@ -35,7 +35,11 @@
   "dependencies": {
     "@babel/plugin-transform-classes": "^7.9.5",
     "body-parser": "^1.19.0",
+<<<<<<< HEAD
     "medusa-core-utils": "^1.1.4",
+=======
+    "medusa-core-utils": "^1.1.5",
+>>>>>>> origin/develop
     "medusa-test-utils": "^1.1.8",
     "twilio": "^3.49.1"
   },