diff --git a/server.js b/server.js
index <HASH>..<HASH> 100644
--- a/server.js
+++ b/server.js
@@ -48,10 +48,6 @@ app.use(function(req, res, next){
     next();
   }
 });
-<<<<<<< HEAD
-
-=======
->>>>>>> c69e2987859e0cdf6e22027ff8118c9a955f34c0
 app.all('*', function(req, res, next) {
   res.header('Access-Control-Allow-Origin', '*');
   res.header('Access-Control-Allow-Headers', 'X-Requested-With');
[CHORE] Cleaning merge commit garbage