diff --git a/client/src/components/post/Post.js b/client/src/components/post/Post.js
index b901859..1f3e790 100644
--- a/client/src/components/post/Post.js
+++ b/client/src/components/post/Post.js
@@ -41,8 +41,5 @@ const mapStateToProps = (state) => ({
   post: state.post
 });
 
-<<<<<<< HEAD
 export default connect(mapStateToProps, { getPost })(Post);
-=======
-export default connect(mapStateToProps, { getPost })(Post);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+