Conflict Resolve

Author: akaash

app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml

@@ -85,11 +85,26 @@
         <data key="country">United States</data>
         <data key="zip">10001</data>
         <data key="rate">10</data>
+    </entity>
     <entity name="SimpleTaxTexas" type="tax">
         <data key="identifier" unique="suffix" >Texas</data>
         <data key="state">Texas</data>
         <data key="country">United States</data>
         <data key="zip">*</data>
         <data key="rate">8.3</data>
     </entity>
+    <entity name="ShippingRateTaxCA" type="tax">
+        <data key="identifier" unique="suffix">Shipping Rate</data>
+        <data key="state">California</data>
+        <data key="country">United States</data>
+        <data key="zip">*</data>
+        <data key="rate">5</data>
+    </entity>
+    <entity name="ProductRateTaxCA" type="tax">
+        <data key="identifier" unique="suffix">Product Rate</data>
+        <data key="state">California</data>
+        <data key="country">United States</data>
+        <data key="zip">*</data>
+        <data key="rate">4</data>
+    </entity>
 </entities>