diff --git a/server/routes/session.routes.js b/server/routes/session.routes.js
index 6cca9a93..676fe0bd 100644
--- a/server/routes/session.routes.js
+++ b/server/routes/session.routes.js
@@ -1,13 +1,20 @@
 import { Router } from 'express';
 import * as SessionController from '../controllers/session.controller';
+<<<<<<< HEAD
 import passport from 'passport';
 
+=======
+>>>>>>> add framework for sessions
 const router = new Router();
 
 router.route('/login').get(SessionController.newSession);
 
+<<<<<<< HEAD
 router.route('/login').post(SessionController.createSession);
 
 router.route('/logout').get(SessionController.destroySession);
 
 //TODO add github authentication stuff
+=======
+router.route('/logout').get(SessionController.destroySession);
+>>>>>>> add framework for sessions
diff --git a/server/server.js b/server/server.js
index 6821472c..47c91f59 100644
--- a/server/server.js
+++ b/server/server.js
@@ -26,12 +26,6 @@ import users from './routes/user.routes';
 //Body parser, cookie parser, sessions, serve public assets
 
 //Body parser, cookie parser, sessions, serve public assets
-app.use(bodyParser.urlencoded({extended: true}));
-app.use(bodyParser.json());
-app.use(cookieParser());
-app.use(session({secret: 'steve brule'}));
-app.use(passport.initialize());
-app.use(passport.session());
 app.use(Express.static(path.resolve(__dirname, '../static')));
 app.use(bodyParser.urlencoded({extended: true}));
 app.use(bodyParser.json());