diff --git a/server/routes/session.routes.js b/server/routes/session.routes.js
index 89d15097..6cca9a93 100644
--- a/server/routes/session.routes.js
+++ b/server/routes/session.routes.js
@@ -1,10 +1,7 @@
 import { Router } from 'express';
 import * as SessionController from '../controllers/session.controller';
 import passport from 'passport';
-<<<<<<< HEAD
 
-=======
->>>>>>> add react router
 const router = new Router();
 
 router.route('/login').get(SessionController.newSession);
@@ -13,8 +10,4 @@ router.route('/login').post(SessionController.createSession);
 
 router.route('/logout').get(SessionController.destroySession);
 
-<<<<<<< HEAD
 //TODO add github authentication stuff
-=======
-//TODO add github authentication stuff
->>>>>>> add react router