diff --git a/client/src/components/profile/ProfileAbout.js b/client/src/components/profile/ProfileAbout.js
index 0809936..a7a2ad3 100644
--- a/client/src/components/profile/ProfileAbout.js
+++ b/client/src/components/profile/ProfileAbout.js
@@ -31,8 +31,4 @@ ProfileAbout.propTypes = {
   profile: PropTypes.object.isRequired
 };
 
-<<<<<<< HEAD
 export default ProfileAbout;
-=======
-export default ProfileAbout;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb