diff --git a/client/src/actions/alert.js b/client/src/actions/alert.js
index 43fec4a..d4dc613 100644
--- a/client/src/actions/alert.js
+++ b/client/src/actions/alert.js
@@ -9,8 +9,4 @@ export const setAlert = (msg, alertType, timeout = 5000) => dispatch => {
   });
 
   setTimeout(() => dispatch({ type: REMOVE_ALERT, payload: id }), timeout);
-<<<<<<< HEAD
 };
-=======
-};
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb