diff --git a/libs/deps/merch-card.js b/libs/deps/merch-card.js
index e2a60715176..304f075aad8 100644
--- a/libs/deps/merch-card.js
+++ b/libs/deps/merch-card.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// Thu, 15 Feb 2024 10:57:10 GMT
-=======
 // Thu, 15 Feb 2024 19:36:43 GMT
->>>>>>> a3e13f4a (MWPW-142130: update the source of merch card name)
 import{html as n,LitElement as T}from"/libs/deps/lit-all.min.js";import{css as x,unsafeCSS as f}from"/libs/deps/lit-all.min.js";var l="(max-width: 767px)";var i="(min-width: 768px)",c="(min-width: 1200px)",s="(min-width: 1600px)";var y=x`
     :host {
         position: relative;
diff --git a/test/blocks/merch-card/merch-card.test.js b/test/blocks/merch-card/merch-card.test.js
index 132145a6a5a..275b7919359 100644
--- a/test/blocks/merch-card/merch-card.test.js
+++ b/test/blocks/merch-card/merch-card.test.js
@@ -370,8 +370,7 @@ describe('Merch Card with Offer Selection', () => {
     const items = quantitySelect.shadowRoot.querySelectorAll('.item');
     items[2].click();
     const button = merchCard.querySelector('.con-button');
-    // TODO to be confirm with Vova.
-    expect(button.getAttribute('data-quantity')).to.equal('1');
+    expect(button.getAttribute('data-quantity')).to.equal('3');
   });
 
   it('Skip Change quantity select render ', async () => {