fix: merge conflicts

.eslintignore

@@ -4,26 +4,40 @@
 /packages/medusa/src/services/claim-item.js
 /packages/medusa/src/services/event-bus.js
 /packages/medusa/src/services/fulfillment-provider.js
+<<<<<<< HEAD
 /packages/medusa/src/services/idempotency-key.js
 /packages/medusa/src/services/inventory.js
 /packages/medusa/src/services/middleware.js
 /packages/medusa/src/services/note.js
+=======
+/packages/medusa/src/services/inventory.js
+/packages/medusa/src/services/middleware.js
+>>>>>>> origin/feat/meilisearch-plugin
 /packages/medusa/src/services/oauth.js
 /packages/medusa/src/services/payment-provider.js
 /packages/medusa/src/services/product-collection.js
 /packages/medusa/src/services/product-variant.js
 /packages/medusa/src/services/product.js
+<<<<<<< HEAD
 /packages/medusa/src/services/query-builder.js
+=======
+>>>>>>> origin/feat/meilisearch-plugin
 /packages/medusa/src/services/return.js
 /packages/medusa/src/services/shipping-profile.js
 /packages/medusa/src/services/store.js
 /packages/medusa/src/services/swap.js
+<<<<<<< HEAD
 /packages/medusa/src/services/system-payment-provider.js
+=======
+>>>>>>> origin/feat/meilisearch-plugin
 /packages/medusa/src/services/totals.js
 
 /packages/medusa/src/subscribers/notification.js
 /packages/medusa/src/subscribers/order.js
+<<<<<<< HEAD
 /packages/medusa/src/subscribers/product.js
+=======
+>>>>>>> origin/feat/meilisearch-plugin
 
 /packages/medusa/src/loaders/api.js
 /packages/medusa/src/loaders/database.js