diff --git a/manpages/apw.1 b/manpages/apw.1
index 6a9baee..7e49957 100644
--- a/manpages/apw.1
+++ b/manpages/apw.1
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-.TH APW 1 "June 2016" Linux "User Manuals"
-=======
 .TH APW 1 "2016-06-09" apw(1.7.x) "User Manuals"
->>>>>>> hotfix
 .SH NAME
 apw \- A package wrapper
 .SH SYNOPSIS
diff --git a/manpages/apw.1.gz b/manpages/apw.1.gz
index d84b78f..e262fdb 100644
Binary files a/manpages/apw.1.gz and b/manpages/apw.1.gz differ