diff --git a/client/src/reducers/alert.js b/client/src/reducers/alert.js
index b66b181..484d232 100644
--- a/client/src/reducers/alert.js
+++ b/client/src/reducers/alert.js
@@ -15,8 +15,5 @@ function alertReducer(state = initialState, action) {
   }
 }
 
-<<<<<<< HEAD
+
 export default alertReducer;
-=======
-export default alertReducer;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb