diff --git a/client/src/components/dashboard/DashboardActions.js b/client/src/components/dashboard/DashboardActions.js
index a9961be..3a63e5d 100644
--- a/client/src/components/dashboard/DashboardActions.js
+++ b/client/src/components/dashboard/DashboardActions.js
@@ -17,8 +17,4 @@ const DashboardActions = () => {
   );
 };
 
-<<<<<<< HEAD
 export default DashboardActions;
-=======
-export default DashboardActions;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb