diff --git a/NuGet.config b/NuGet.config
index 1064db659..45e09c64d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,16 +7,10 @@
-<<<<<<< HEAD
-=======
->>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd
-<<<<<<< HEAD
-=======
->>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd
@@ -29,9 +23,6 @@
-<<<<<<< HEAD
-=======
->>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd
@@ -48,19 +39,12 @@
-<<<<<<< HEAD
-
-=======
-
-
-
->>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd