diff --git a/README.md b/README.md
index 835afc78..4270bcf2 100644
--- a/README.md
+++ b/README.md
@@ -82,12 +82,8 @@ A curated list of awesome Python frameworks, libraries and software. Inspired by
     - [Algorithms and Design Patterns](#algorithms-and-design-patterns)
     - [Editor Plugins](#editor-plugins)
     - [IDEs](#ides)
-<<<<<<< HEAD
 - [Services](#services)
     - [Cloud continuous integration](#cloud-continuous-integration)
-=======
-    - [Chat](#chat)
->>>>>>> upstream/master
 - [Resources](#resources)
     - [Websites](#websites)
     - [Weekly](#weekly)