diff --git a/src/index.js b/src/index.js
index 5111bc5f5c3f6a58e9e23bbca2816de00cafaf81..2d73129e95d8905dfc5e645a33f556be6a6c84b1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,13 +3,7 @@
  */
 import server from './server';
 import colors from 'colors';
-<<<<<<< HEAD
 import setupLdapAuth from './ldap/ldap_auth.js';
-=======
-import { graphqlExpress, graphiqlExpress } from 'graphql-server-express';
-import makeExecutableSchema from 'graphql-tools';
-import setupLdapAuth from './ldap/ldap_auth';
->>>>>>> ae873fe15e2b7ad99437bcd23a8dd5e6263b6683
 import router from './admin_view/admin_router';
 
 // setting up ldap authentication