diff --git a/docs/man/glances.1 b/docs/man/glances.1
index e42a8e58bd2c24da20b3c51ff448ecf84b9bc676..54bd3bbfd45bffc3be345aa24192d5f8638b9a7c 100644
--- a/docs/man/glances.1
+++ b/docs/man/glances.1
@@ -1,10 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-<<<<<<< HEAD
 .TH "GLANCES" "1" "Aug 19, 2020" "3.1.5" "Glances"
-=======
-.TH "GLANCES" "1" "Mar 25, 2020" "3.1.4.1" "Glances"
->>>>>>> master
 .SH NAME
 glances \- An eye on your system
 .