diff --git a/client/src/utils/formatDate.js b/client/src/utils/formatDate.js
index 002b464..3dcf024 100644
--- a/client/src/utils/formatDate.js
+++ b/client/src/utils/formatDate.js
@@ -3,7 +3,3 @@ function formatDate(date) {
 }
 
 export default formatDate;
-<<<<<<< HEAD
-=======
-
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb