diff --git a/client/src/components/posts/PostForm.js b/client/src/components/posts/PostForm.js
index af41cec..72484f9 100644
--- a/client/src/components/posts/PostForm.js
+++ b/client/src/components/posts/PostForm.js
@@ -41,8 +41,4 @@ PostForm.propTypes = {
 export default connect(
   null,
   { addPost }
-<<<<<<< HEAD
 )(PostForm);
-=======
-)(PostForm);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb