Resolved conflicts

Author: Manjusha.S

app/code/Magento/Catalog/Test/Mftf/Test/AdminAddCustomAttributeWithoutAttributeSetToProductTest.xml

@@ -11,10 +11,12 @@
         <annotations>
             <features value="Catalog"/>
             <stories value="Add Custom Attribute Without Attribute Set To Product"/>
-            <title value="Admin should be able to create a attribute without attribute set"/>
-            <description value="Admin should be able to create a attribute without attribute set"/>
-            <severity value="MAJOR"/>
+            <title value="Admin should be able to create a attribute without attrinute set"/>
+            <description value="Admin should be able to create a attribute without attrinute set"/>
+            <severity value="BLOCKER"/>
             <testCaseId value="MC-27235"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
         </annotations>
 
         <before>