diff --git a/SkyTeam/SkyTeam.csproj b/SkyTeam/SkyTeam.csproj
index ea1d73e..694c014 100644
--- a/SkyTeam/SkyTeam.csproj
+++ b/SkyTeam/SkyTeam.csproj
@@ -9,11 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-<<<<<<< HEAD
     <PackageReference Include="MySql.Data" Version="9.6.0" />
-=======
-    <PackageReference Include="MahApps.Metro.IconPacks" Version="6.2.1" />
->>>>>>> deaa68880afaf3dd53903180eef7a43c3e23056a
   </ItemGroup>
 
 </Project>