diff --git a/client/src/components/profiles/ProfileItem.js b/client/src/components/profiles/ProfileItem.js
index 2fba35a..f55f44d 100644
--- a/client/src/components/profiles/ProfileItem.js
+++ b/client/src/components/profiles/ProfileItem.js
@@ -39,8 +39,5 @@ ProfileItem.propTypes = {
   profile: PropTypes.object.isRequired
 };
 
-<<<<<<< HEAD
 export default ProfileItem;
-=======
-export default ProfileItem;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+