diff --git a/pages/articles.js b/pages/articles.js
index 845768e..5560b3d 100644
--- a/pages/articles.js
+++ b/pages/articles.js
@@ -31,8 +31,4 @@ const Articles = () => {
   )
 }
 
-<<<<<<< HEAD
 export default withApollo(Articles)
-=======
-export default withApollo({ ssr: true })(Articles)
->>>>>>> d845bf167260c295393e750017fc4e327e987967