diff --git a/doc/yabai.1 b/doc/yabai.1
index eb426581..dd2240ba 100644
--- a/doc/yabai.1
+++ b/doc/yabai.1
@@ -2,20 +2,12 @@
 .\"     Title: yabai
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.12
-<<<<<<< HEAD
-.\"      Date: 2021-05-05
-=======
 .\"      Date: 2021-05-25
->>>>>>> master
 .\"    Manual: Yabai Manual
 .\"    Source: Yabai
 .\"  Language: English
 .\"
-<<<<<<< HEAD
-.TH "YABAI" "1" "2021-05-05" "Yabai" "Yabai Manual"
-=======
 .TH "YABAI" "1" "2021-05-25" "Yabai" "Yabai Manual"
->>>>>>> master
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0