Resolved conflicts

Author: engcom-Charlie

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

@@ -36,14 +36,10 @@
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-<<<<<<< HEAD
         <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
             <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
             <argument name="productType" value="{{BundleProduct.type}}"/>
         </actionGroup>
-=======
-        <actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
->>>>>>> magento2/2.4-develop
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
         <actionGroup ref="FillMainBundleProductFormActionGroup" stepKey="fillMainFieldsForBundle"/>
         <actionGroup ref="AddBundleOptionWithOneProductActionGroup" stepKey="addBundleOption1">