diff --git a/client/src/components/post/CommentForm.js b/client/src/components/post/CommentForm.js
index f0004fa..7a3c381 100644
--- a/client/src/components/post/CommentForm.js
+++ b/client/src/components/post/CommentForm.js
@@ -41,8 +41,5 @@ CommentForm.propTypes = {
 export default connect(
   null,
   { addComment }
-<<<<<<< HEAD
 )(CommentForm);
-=======
-)(CommentForm);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+