diff --git a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S1186.json b/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S1186.json
deleted file mode 100644
index 37edd4c9141..00000000000
--- a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S1186.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-"issues":  [
-{
-"id":  "S1186",
-"message":  "Add a nested comment explaining why this method is empty, throw a 'NotSupportedException' or complete the implementation.",
-"location":  {
-"uri":  "sources\SonarLintExclusions\SonarLintExclusions\Excluded.cs",
-"region":  {
-"startLine":  5,
-"startColumn":  34,
-"endLine":  5,
-"endColumn":  39
-}
-}
-}
-]
-}
diff --git a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S2094.json b/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S2094.json
deleted file mode 100644
index 0c32aed49c8..00000000000
--- a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S2094.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-"issues":  [
-{
-"id":  "S2094",
-"message":  "Remove this empty class, write its code or make it an "interface".",
-"location":  {
-"uri":  "sources\SonarLintExclusions\SonarLintExclusions\Included.cs",
-"region":  {
-"startLine":  3,
-"startColumn":  18,
-"endLine":  3,
-"endColumn":  26
-}
-}
-}
-]
-}
diff --git a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3168.json b/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3168.json
deleted file mode 100644
index baa65b0af7f..00000000000
--- a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3168.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-"issues":  [
-{
-"id":  "S3168",
-"message":  "Return 'Task' instead.",
-"location":  {
-"uri":  "sources\SonarLintExclusions\SonarLintExclusions\Excluded.cs",
-"region":  {
-"startLine":  5,
-"startColumn":  29,
-"endLine":  5,
-"endColumn":  33
-}
-}
-}
-]
-}
diff --git a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3990.json b/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3990.json
deleted file mode 100644
index 17786f2ed3f..00000000000
--- a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3990.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-"issues":  [
-{
-"id":  "S3990",
-"message":  "Provide a 'CLSCompliant' attribute for assembly 'SonarLintExclusions'.",
-"location":  null
-}
-]
-}
diff --git a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3992.json b/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3992.json
deleted file mode 100644
index dfd144e2a2e..00000000000
--- a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusions--net7.0-S3992.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-"issues":  [
-{
-"id":  "S3992",
-"message":  "Provide a 'ComVisible' attribute for assembly 'SonarLintExclusions'.",
-"location":  null
-}
-]
-}
diff --git a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusionsTest--net7.0-S2699.json b/analyzers/its/expected/SonarLintExclusions/SonarLintExclusionsTest--net7.0-S2699.json
deleted file mode 100644
index eec43ac315c..00000000000
--- a/analyzers/its/expected/SonarLintExclusions/SonarLintExclusionsTest--net7.0-S2699.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-"issues":  [
-{
-"id":  "S2699",
-"message":  "Add at least one assertion to this test case.",
-"location":  {
-"uri":  "sources\SonarLintExclusions\SonarLintExclusionsTest\ExcludedTest.cs",
-"region":  {
-"startLine":  8,
-"startColumn":  21,
-"endLine":  8,
-"endColumn":  32
-}
-}
-},
-{
-"id":  "S2699",
-"message":  "Add at least one assertion to this test case.",
-"location":  {
-"uri":  "sources\SonarLintExclusions\SonarLintExclusionsTest\IncludedTest.cs",
-"region":  {
-"startLine":  8,
-"startColumn":  21,
-"endLine":  8,
-"endColumn":  32
-}
-}
-}
-]
-}
diff --git a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude1.cs b/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude1.cs
deleted file mode 100644
index 61e1bcc6218..00000000000
--- a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude1.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace SonarLintExclusionsExcludeAllButOne
-{
-    public class Exclude1
-    {
-
-    }
-}
diff --git a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude2.cs b/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude2.cs
deleted file mode 100644
index 5955a0757a4..00000000000
--- a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude2.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace SonarLintExclusionsExcludeAllButOne
-{
-    public class Exclude2
-    {
-
-    }
-}
diff --git a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude3.cs b/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude3.cs
deleted file mode 100644
index 52d821f0b4b..00000000000
--- a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Exclude3.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace SonarLintExclusionsExcludeAllButOne
-{
-    public class Exclude3
-    {
-
-    }
-}
diff --git a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Include.cs b/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Include.cs
deleted file mode 100644
index 5946d1c42fc..00000000000
--- a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/Include.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace SonarLintExclusionsExcludeAllButOne
-{
-    public class Class1
-    {
-
-    }
-}
\ No newline at end of file
diff --git a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/SonarLintExclusionsExcludeAllButOne.csproj b/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/SonarLintExclusionsExcludeAllButOne.csproj
deleted file mode 100644
index 132c02c59c2..00000000000
--- a/analyzers/its/sources/SonarLintExclusions/SonarLintExclusionsExcludeAllButOne/SonarLintExclusionsExcludeAllButOne.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>
diff --git a/analyzers/tests/SonarAnalyzer.UnitTest/TestFramework/AnalysisScaffolding.cs b/analyzers/tests/SonarAnalyzer.UnitTest/TestFramework/AnalysisScaffolding.cs
index 1003e7b7a3b..5f518397a40 100644
--- a/analyzers/tests/SonarAnalyzer.UnitTest/TestFramework/AnalysisScaffolding.cs
+++ b/analyzers/tests/SonarAnalyzer.UnitTest/TestFramework/AnalysisScaffolding.cs
@@ -91,23 +91,7 @@ public static string CreateSonarProjectConfigWithFilesToAnalyze(TestContext cont
             string[] testExclusions = null,
             string[] testInclusions = null,
             string[] globalTestExclusions = null) =>
-<<<<<<< HEAD
             TestHelper.WriteFile(context, "SonarLint.xml", GenerateSonarLintXmlContent(language, analyzeGeneratedCode, exclusions, inclusions, globalExclusions, testExclusions, testInclusions, globalTestExclusions));
-=======
-            TestHelper.WriteFile(context, "SonarLint.xml",
-                new XDocument(
-                    new XDeclaration("1.0", "utf-8", "yes"),
-                    new XElement("AnalysisInput",
-                        new XElement("Settings",
-                            CreateKeyValuePair("Setting", $"sonar.{(language == LanguageNames.CSharp ? "cs" : "vbnet")}.ignoreHeaderComments", ignoreHeaderComments.ToString()),
-                            CreateKeyValuePair("Setting", $"sonar.{(language == LanguageNames.CSharp ? "cs" : "vbnet")}.analyzeGeneratedCode", analyzeGeneratedCode.ToString()),
-                            CreateKeyValuePair("Setting", "sonar.exclusions", string.Join(",", exclusions ?? Array.Empty<string>())),
-                            CreateKeyValuePair("Setting", "sonar.inclusions", string.Join(",", inclusions ?? Array.Empty<string>())),
-                            CreateKeyValuePair("Setting", "sonar.global.exclusions", string.Join(",", globalExclusions ?? Array.Empty<string>())),
-                            CreateKeyValuePair("Setting", "sonar.test.exclusions", string.Join(",", testExclusions ?? Array.Empty<string>())),
-                            CreateKeyValuePair("Setting", "sonar.test.inclusions", string.Join(",", testInclusions ?? Array.Empty<string>())),
-                            CreateKeyValuePair("Setting", "sonar.global.test.exclusions", string.Join(",", globalTestExclusions ?? Array.Empty<string>()))))).ToString());
->>>>>>> 11aa64900 (Addressed PR comments)
 
         public static string GenerateSonarLintXmlContent(
             string language = LanguageNames.CSharp,