diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj
index d0d3813bc..102298a29 100644
--- a/src/Jackett/Jackett.csproj
+++ b/src/Jackett/Jackett.csproj
@@ -199,11 +199,8 @@
     <Compile Include="Indexers\Demonoid.cs" />
     <Compile Include="Indexers\FrenchTorrentDb.cs" />
     <Compile Include="Indexers\BroadcastTheNet.cs" />
-<<<<<<< HEAD
     <Compile Include="Indexers\DanishBits.cs" />
-=======
     <Compile Include="Indexers\GFTracker.cs" />
->>>>>>> refs/remotes/origin/GFTracker
     <Compile Include="Indexers\TehConnection.cs" />
     <Compile Include="Indexers\Hounddawgs.cs" />
     <Compile Include="Indexers\Shazbat.cs" />