diff --git a/tfc.fmf b/tfc.fmf
index 12852a58..d5d07963 100644
--- a/tfc.fmf
+++ b/tfc.fmf
@@ -1,12 +1,8 @@
 FTEMANIFEST 1
 GAME tfc
 NAME "Team Fortress"
-<<<<<<< HEAD
 BASEGAME platform
 BASEGAME logos
-=======
-BASEGAME nuclide
->>>>>>> 0246a10b124be549d1bdbce3a96c8619ad29c9ec
 BASEGAME tfc
 
 // custom game menu variables