diff --git a/src/components/TopLevel.component.js b/src/components/TopLevel.component.js
index f758d39..36a1e88 100644
--- a/src/components/TopLevel.component.js
+++ b/src/components/TopLevel.component.js
@@ -80,8 +80,4 @@ export default class TopLevelComponent extends Component {
         game_service.set_n_boats(5)
         game_service.advance_game_state()
     }
-
-<<<<<<< HEAD
 }
-=======
->>>>>>> 19aa3733d0604f37e6875b825eb51ccd4092d4c4