MC-3406: Explicit Background Attributes for Tab

 - fix merge issues

Author: cspruiell

app/code/Magento/PageBuilder/Test/Mftf/Data/TabData.xml

@@ -70,4 +70,11 @@
         <data key="fieldName">min_height</data>
         <data key="value">1000</data>
     </entity>
+    <entity name="PageBuilderTabBackgroundColorPink" type="pagebuilder_row_background_color_property">
+        <data key="name">Background Color</data>
+        <data key="section">background</data>
+        <data key="fieldName">background_color</data>
+        <data key="value">#ffc0cb</data>
+        <data key="rgb">rgb(255, 192, 203)</data>
+    </entity>
 </entities>