diff --git a/client/src/components/profile/ProfileGithub.js b/client/src/components/profile/ProfileGithub.js
index 67b374d..70e7557 100644
--- a/client/src/components/profile/ProfileGithub.js
+++ b/client/src/components/profile/ProfileGithub.js
@@ -48,8 +48,5 @@ const mapStateToProps = state => ({
   repos: state.profile.repos
 });
 
-<<<<<<< HEAD
 export default connect(mapStateToProps, { getGithubRepos })(ProfileGithub);
-=======
-export default connect(mapStateToProps, { getGithubRepos })(ProfileGithub);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+