diff --git a/client/src/components/dashboard/Education.js b/client/src/components/dashboard/Education.js
index 57a75fa..7517019 100644
--- a/client/src/components/dashboard/Education.js
+++ b/client/src/components/dashboard/Education.js
@@ -46,8 +46,4 @@ Education.propTypes = {
   deleteEducation: PropTypes.func.isRequired
 };
 
-<<<<<<< HEAD
 export default connect(null, { deleteEducation })(Education);
-=======
-export default connect(null, { deleteEducation })(Education);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb