diff --git a/src/components/TopLevel.component.js b/src/components/TopLevel.component.js
index 7127d40..66214e2 100644
--- a/src/components/TopLevel.component.js
+++ b/src/components/TopLevel.component.js
@@ -81,8 +81,3 @@ export default class TopLevelComponent extends Component {
         game_service.set_n_boats(5)
     }
 }
-
-<<<<<<< HEAD
-}
-=======
->>>>>>> 19aa3733d0604f37e6875b825eb51ccd4092d4c4