diff --git a/src/main/java/electrosphere/renderer/RenderUtils.java b/src/main/java/electrosphere/renderer/RenderUtils.java
index 4f44df26..59ba99ec 100644
--- a/src/main/java/electrosphere/renderer/RenderUtils.java
+++ b/src/main/java/electrosphere/renderer/RenderUtils.java
@@ -674,10 +674,7 @@ public class RenderUtils {
 //                    currentModel.draw();
 //                }
         }
-<<<<<<< HEAD
-=======
-        boolean renderHitboxes = false;
->>>>>>> 1f90094761262a9a137f96e246d1fbd70437a8b8
+        
         if(renderHitboxes){
             for(Entity currentHitbox : Globals.hitboxManager.getAllHitboxes()){
                 Model hitboxModel;