diff --git a/client/src/components/profiles/Profiles.js b/client/src/components/profiles/Profiles.js
index b83853a..dcea737 100644
--- a/client/src/components/profiles/Profiles.js
+++ b/client/src/components/profiles/Profiles.js
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import React, { Fragment, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
@@ -47,47 +46,3 @@ const mapStateToProps = (state) => ({
 });
 
 export default connect(mapStateToProps, { getProfiles })(Profiles);
-=======
-import React from 'react';
-import { Link } from 'react-router-dom';
-import PropTypes from 'prop-types';
-
-const ProfileItem = ({
-  profile: {
-    user: { _id, name, avatar },
-    status,
-    company,
-    location,
-    skills
-  }
-}) => {
-  return (
-    <div className='profile bg-light'>
-      <img src={avatar} alt='' className='round-img' />
-      <div>
-        <h2>{name}</h2>
-        <p>
-          {status} {company && <span> at {company}</span>}
-        </p>
-        <p className='my-1'>{location && <span>{location}</span>}</p>
-        <Link to={`/profile/${_id}`} className='btn btn-primary'>
-          View Profile
-        </Link>
-      </div>
-      <ul>
-        {skills.slice(0, 4).map((skill, index) => (
-          <li key={index} className='text-primary'>
-            <i className='fas fa-check' /> {skill}
-          </li>
-        ))}
-      </ul>
-    </div>
-  );
-};
-
-ProfileItem.propTypes = {
-  profile: PropTypes.object.isRequired
-};
-
-export default ProfileItem;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb