diff --git a/client/src/components/post/CommentItem.js b/client/src/components/post/CommentItem.js
index 7f01817..c8cbb31 100644
--- a/client/src/components/post/CommentItem.js
+++ b/client/src/components/post/CommentItem.js
@@ -45,8 +45,5 @@ const mapStateToProps = (state) => ({
   auth: state.auth
 });
 
-<<<<<<< HEAD
 export default connect(mapStateToProps, { deleteComment })(CommentItem);
-=======
-export default connect(mapStateToProps, { deleteComment })(CommentItem);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+