diff --git a/NuGet.config b/NuGet.config
index 46d2f1d99257..0b2629f92cfb 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,17 +4,10 @@
-<<<<<<< HEAD
-
-
-
-
-=======
->>>>>>> v7.0.12
@@ -33,17 +26,10 @@
-<<<<<<< HEAD
-
-
-
-
-=======
->>>>>>> v7.0.12