fix: merge develop

packages/medusa-payment-klarna/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.9](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.8...medusa-payment-klarna@1.1.9) (2021-04-13)
-=======
-## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.8...medusa-payment-klarna@1.1.9) (2021-04-09)
->>>>>>> origin/develop
 
 
 ### Bug Fixes

packages/medusa-payment-klarna/package.json

@@ -40,11 +40,7 @@
     "axios": "^0.21.0",
     "body-parser": "^1.19.0",
     "express": "^4.17.1",
-<<<<<<< HEAD
-    "medusa-core-utils": "^1.1.4",
-=======
     "medusa-core-utils": "^1.1.5",
->>>>>>> origin/develop
     "medusa-test-utils": "^1.1.8"
   },
   "gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c"