Conflic tResolve

Author: akaash

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminUpdateQuantityInAdvancedPricingWithIndexActionGroup.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminUpdateQuantityInAdvancedPricingWithIndexActionGroup">
+        <annotations>
+            <description>Update quantity  in Advanced Pricing on the Admin Product creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="quantity" type="string" defaultValue="1"/>
+            <argument name="index" type="string" defaultValue="0"/>
+        </arguments>
+        <waitForElementClickable selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="waitForAdvancedPricingLinkToBeClicked"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton"/>
+        <waitForPageLoad stepKey="waitForAdvancedPricingPageToLoad"/>
+        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect(index)}}" stepKey="waitForTextFieldToUpdateQty"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput(index)}}" userInput="{{quantity}}" stepKey="fillProductTierPriceQtyInput"/>
+        <waitForElementClickable selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="waitForDoneButtonToBeClicked"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <waitForPageLoad stepKey="WaitForProductSave"/>
+    </actionGroup>
+</actionGroups>
+