diff --git a/frontend/static/js/api/game/Segment.js b/frontend/static/js/api/game/Segment.js
index 71a0e05..d33bdb6 100644
--- a/frontend/static/js/api/game/Segment.js
+++ b/frontend/static/js/api/game/Segment.js
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 import { Point } from "./Point.js";
-=======
-import { Point } from "./Point.js"
 import { renderCube } from "../../3D/cube.js"
->>>>>>> de2488589cf0a579b849e706b40901c355ff35f8
 
 class Segment
 {