Merge 2.4-develop

Author: AnnaAPak

app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml

@@ -78,16 +78,11 @@
 
         <!--Creating Second bundle product-->
         <!--Go to bundle product creation page-->
-<<<<<<< HEAD
-        <actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage2"/>
-        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage2"/>
-=======
         <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage2">
             <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
             <argument name="productType" value="{{BundleProduct.type}}"/>
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad2"/>
->>>>>>> 2.4-develop
 
         <!--Create bundle product 2-->
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="conditionallyOpenSectionBundleItems2"/>

app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml

@@ -35,14 +35,10 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!--Go to bundle product creation page-->
-<<<<<<< HEAD
-        <actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
-=======
         <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
             <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
             <argument name="productType" value="{{BundleProduct.type}}"/>
         </actionGroup>
->>>>>>> 2.4-develop
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
 
         <!-- Add two bundle items -->