Resolved merge conflicts

cypress/e2e/tests/migration/applicationinventory/applications/language_discovery.test.ts

@@ -33,6 +33,7 @@ describe(["@tier2"], "Test if application language is discovered and tagged corr
         login();
     });
 
+<<<<<<< HEAD
     beforeEach("Load Data", function () {
         cy.fixture("application").then(function (appData) {
             this.appData = appData;
@@ -58,6 +59,32 @@ describe(["@tier2"], "Test if application language is discovered and tagged corr
         sidedrawerTab("Java_language_maven_tooling_quarkus_framework", "Tags");
         cy.contains("No tags available", { timeout: 60 * SEC }).should("not.exist");
         assertTagsInSection(sectionsTags);
+=======
+    languageDiscoveryData.forEach((data) => {
+        it(`test ${data.name.split("-").join(" ")}`, function () {
+            // Automates TCs 582, 583, 584, 585, 585, 586, 587
+
+            const sectionsTags = data.sections_tags;
+            const application = new Application(
+                getRandomApplicationData(data.name, {
+                    sourceData: {
+                        repoType: data.repoType,
+                        sourceRepo: data.sourceRepo,
+                    },
+                })
+            );
+            application.create();
+            applicationList.push(application);
+            cy.wait(2 * SEC);
+            sidedrawerTab(data.name, "Tags");
+            cy.contains("No tags available", { timeout: 60 * SEC }).should("not.exist");
+            assertTagsInSection(sectionsTags);
+        });
+    });
+
+    afterEach("Persist session", function () {
+        Application.open(true);
+>>>>>>> 770d99d305e231bb9c4c5952e54bbbe6f6b3bc03
     });
 
     it("Application written in java and typescript with Maven and NodeJS tooling ", function () {

cypress/fixtures/application.json

@@ -64,6 +64,7 @@
         "sourceRepo": "https://github.com/konveyor/tackle-testapp-public",
         "branch": "feature/test-java9-removed-packagek"
     },
+<<<<<<< HEAD
     "Java_language_maven_tooling_quarkus_framework": {
         "repoType": "Git",
         "sourceRepo": "https://github.com/quarkusio/quarkus-super-heroes"
@@ -72,6 +73,8 @@
         "repoType": "Git",
         "sourceRepo": "https://github.com/pkaul/maven-typescript-example"
     },
+=======
+>>>>>>> 770d99d305e231bb9c4c5952e54bbbe6f6b3bc03
     "java-example-app": {
         "repoType": "Git",
         "sourceRepo": "https://github.com/ibraginsky/book-server"