ACQE-7157 | Mainline PR Deployment

Conflicts Fix

Author: manjusha729

app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml

@@ -697,7 +697,6 @@
         <data key="uses_per_coupon">2</data>
         <data key="simple_free_shipping">0</data>
     </entity>
-<<<<<<< HEAD
     <entity name="CustomSalesRuleWithNoCouponCode" type="SalesRule">
         <data key="name" unique="suffix">SalesRule</data>
         <data key="websites">Main Website</data>