diff --git a/git.md b/git.md
index 7102050..6b6053e 100644
--- a/git.md
+++ b/git.md
@@ -2,7 +2,6 @@
 
 ## Table of contents
 
-<<<<<<< HEAD
 - [glossary](#glossary)
 - [terminology](#terminology)
 - [branches](#branches)