fix: merge develop

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"