diff --git a/client/src/components/profile/ProfileTop.js b/client/src/components/profile/ProfileTop.js
index a38adc5..e204846 100644
--- a/client/src/components/profile/ProfileTop.js
+++ b/client/src/components/profile/ProfileTop.js
@@ -48,8 +48,5 @@ ProfileTop.propTypes = {
   profile: PropTypes.object.isRequired
 };
 
-<<<<<<< HEAD
+
 export default ProfileTop;
-=======
-export default ProfileTop;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb