diff --git a/app.js b/app.js
index 5eae8d1ef07914fa9dc3dbccc675532f40157c43..0839084ad161b24dae706d86640a61e992b893a1 100644
--- a/app.js
+++ b/app.js
@@ -58,8 +58,5 @@ async function main() {
   server.listen(socketPort, () => {
     console.log("running on port " + socketPort);
   });
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> d4db7fb6f22a8afc093c1a32a495324d90af24a6
+