resolved conflicts

Author: Manjusha.S

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

@@ -32,16 +32,9 @@
         </before>
 
         <after>
-<<<<<<< HEAD
-<<<<<<< HEAD
-            <!--Remove default flat rate shipping method settings-->
-            <magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
-=======
->>>>>>> 5f94f99e29f (MC-36889:Admin orders multi-select action applied to unchecked newly created orders)
-=======
+
             <!--Remove default flat rate shipping method settings-->
             <magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
->>>>>>> 9709019c890 (MC-36889:Admin orders multi-select action applied to unchecked newly created orders)
             <!--Delete product-->
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <!--Delete customer-->