diff --git a/ZoFo/ZoFo.csproj b/ZoFo/ZoFo.csproj
index a2b6bc2..70c8cbc 100644
--- a/ZoFo/ZoFo.csproj
+++ b/ZoFo/ZoFo.csproj
@@ -21,13 +21,10 @@
     <ItemGroup>
         <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
         <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
-<<<<<<< HEAD
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\MonogameLibrary\MonogameLibrary.csproj" />
-=======
->>>>>>> CollisionManager
     </ItemGroup>
     <ItemGroup>
       <Folder Include="Content\Texture\GUI\" />