resolved conflicts

Author: Manjusha.S

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminAddOptionsToAttributeWithDefaultLayeredNavigationActionGroup.xml

@@ -19,6 +19,8 @@
             <argument name="option3" defaultValue="colorProductAttribute3"/>
         </arguments>
 
+        <scrollTo selector="//div/strong[@class='admin__collapsible-title']/span[contains(text(),'Configurations')]" stepKey="scrollToConfigurableProductButton"/>
+        <waitForElementVisible selector="button[data-index='create_configurable_products_button']" time="30" stepKey="waitForELementVisible"/>
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnCreateConfigurations"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
         <waitForPageLoad stepKey="waitForIFrame"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminGotoSelectValueAttributePageActionGroup.xml

@@ -16,6 +16,7 @@
         <arguments>
             <argument name="defaultLabelAttribute" type="string" defaultValue="{{colorProductAttribute.default_label}}"/>
         </arguments>
+
         <switchToIFrame stepKey="switchOutOfIFrame"/>
         <waitForPageLoad stepKey="waitForFilters"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateNewAttributeActionGroup.xml

@@ -50,6 +50,7 @@
         <click selector="{{NewProduct.saveAttributeButton}}" stepKey="clickSaveAttributeButton"/>
         <waitForPageLoad stepKey="waitForSavingSettings"/>
         <switchToIFrame stepKey="switchOutOfIFrame"/>
+
         <!--Select created Attribute -->
         <click selector="{{ConfigurableProductSection.selectCreatedAttribute}}" stepKey="selectCreatedAttribute"/>