merge conflict resolving

Author: engcom-Hotel

app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml

@@ -18,7 +18,6 @@
             <useCaseId value="MAGETWO-96431"/>
             <group value="Checkout"/>
         </annotations>
-
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <createData entity="Simple_US_Customer" stepKey="createSimpleUsCustomer">
@@ -61,7 +60,6 @@
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-
         <actionGroup ref="ApplyCartRuleOnStorefrontActionGroup" stepKey="applyCartRule">
             <argument name="product" value="$$simpleProduct$$"/>
             <argument name="couponCode" value="{{CatPriceRule.coupon_code}}"/>