diff --git a/src/main/java/buttondevteam/lib/TBMCPlayer.java b/src/main/java/buttondevteam/lib/TBMCPlayer.java
index 677d1b9..0390a83 100644
--- a/src/main/java/buttondevteam/lib/TBMCPlayer.java
+++ b/src/main/java/buttondevteam/lib/TBMCPlayer.java
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 package buttondevteam.lib;
 
 import java.io.File;