diff --git a/.gitignore b/.gitignore
index 7c815e785..caef0e940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -236,7 +236,4 @@ _Pvt_Extensions
 .fake/
 *.ncrunchproject
 *.ncrunchsolution
-<<<<<<< HEAD
-/Package.nuspec
-=======
->>>>>>> master
+