ACQE-6765:Admin create shipping label for usps shipping method with international address

- Resolved conflicts2.

Author: chandrakalahanchinal

app/code/Magento/Shipping/Test/Mftf/Data/USPSShippingMethodData.xml

@@ -71,7 +71,7 @@
     <entity name="AdminFillFreeShippingAmountThresholdUSPSConfigData" type="usps_config">
         <data key="path">carriers/usps/free_shipping_subtotal</data>
         <data key="value">49</data>
-=======
+    </entity>
     <entity name="AdminSetUSPSTypeToUSPSRestAPIUSPSConfigData" type="usps_config">
         <data key="path">carriers/usps/usps_type</data>
         <data key="value">USPS_REST</data>