conflict resolved while merging ACQE-6165

Author: nikhilsharma-adobe

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundSectionDefaultValues.xml

@@ -87,10 +87,10 @@
         <actionGroup ref="seeNoImageUploadedOnSlideOut" stepKey="validateNoFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldTooltip" stepKey="validateTooltipFallbackImage">
+        <actionGroup ref="validateSlideOutPanelFieldTooltipWithUploaderId" stepKey="validateTooltipFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldHelperText" stepKey="validateHelperTextFallbackImage">
+        <actionGroup ref="validateSlideOutPanelFieldHelperTextWithUploaderId" stepKey="validateHelperTextFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
     </test>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowNoRequiredAttributesTest.xml

@@ -42,7 +42,7 @@
         <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundColor">
             <argument name="property" value="PageBuilderBackgroundColor_Default"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundImage">
+        <actionGroup ref="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup" stepKey="validateBackgroundImage">
             <argument name="property" value="PageBuilderBackgroundImage_Default"/>
         </actionGroup>
         <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundPosition">