fixed semantic

Author: AnnaAPak

app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml

@@ -79,14 +79,8 @@
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForProductPageLoad"/>
 
-<<<<<<< HEAD
-        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
-            <argument name="email" value="$$createCustomer.email$$"/>
-=======
-        <!-- Search and open customer -->
         <actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
             <argument name="customerId" value="$createCustomer.id$"/>
->>>>>>> 2.4-develop
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterCreatedCustomer"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>