diff --git a/client/src/components/profile/ProfileEducation.js b/client/src/components/profile/ProfileEducation.js
index d6fa0d8..021958c 100644
--- a/client/src/components/profile/ProfileEducation.js
+++ b/client/src/components/profile/ProfileEducation.js
@@ -26,8 +26,5 @@ ProfileEducation.propTypes = {
   education: PropTypes.object.isRequired
 };
 
-<<<<<<< HEAD
+
 export default ProfileEducation;
-=======
-export default ProfileEducation;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb