diff --git a/src/index.js b/src/index.js
index 7a5fde1fd3a43a0743ca6ceb40af56694f2403d4..df0984402043c7babcf57af39305f2f3c29e1ef5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,11 +1,8 @@
 import LoginScreen from './login';
 import TableView from './views/tableView';
 import { UserModal, UserTable, NewUser } from './userTool';
-<<<<<<< HEAD
 import { MembershipView } from './membershipTool';
-=======
 import { EventTable, NewEvent } from './eventTool';
->>>>>>> Testing small eventTool.
 import Sidebar from './sidebar';
 import AnnounceTool from './announceTool';