diff --git a/client/src/components/routing/PrivateRoute.js b/client/src/components/routing/PrivateRoute.js
index 70a7af5..c1fbe83 100644
--- a/client/src/components/routing/PrivateRoute.js
+++ b/client/src/components/routing/PrivateRoute.js
@@ -22,8 +22,5 @@ const mapStateToProps = (state) => ({
   auth: state.auth
 });
 
-<<<<<<< HEAD
+
 export default connect(mapStateToProps)(PrivateRoute);
-=======
-export default connect(mapStateToProps)(PrivateRoute);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb