diff --git a/PKGBUILD/apw b/PKGBUILD/apw
index dbc3c5f..d125e7c 160000
--- a/PKGBUILD/apw
+++ b/PKGBUILD/apw
@@ -1 +1 @@
-Subproject commit dbc3c5f4dc7ba1b3525f916ec3e75ca5442a6511
+Subproject commit d125e7cc97c396cae5d2fe91ed6fee2e4b8f8242
diff --git a/manpages/apw.1 b/manpages/apw.1
index 223bc44..6a9baee 100644
--- a/manpages/apw.1
+++ b/manpages/apw.1
@@ -1,4 +1,8 @@
+<<<<<<< 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
@@ -6,6 +10,7 @@ apw \- A package wrapper
 .SH DESCRIPTION
 .B apw
 is a *multi-distribution* wrapper to manage packages.
+
 It is case insensitive and is able to recognize commands with and without dashes 
 .SH OPTIONS
 .IP -U
@@ -24,6 +29,13 @@ Clean system from dependences that are not in use (ADVANCED, BE CAREFUL!)
 Search in package database
 .IP -F
 Install file (distro family dependent, e.g. .deb, .pkg.tar.xz,...)
+
 Append y to -U or -I (-Uy -Iy -Iry) for autoconfirm the operations
+.SH EXAMPLES
+ #apw -I pimagizer cryptojka
+
+ #apw -R google-chrome
+
+ #apw -S libgcrypt
 .SH AUTHOR AND CREDITS
 apw is write and maintain by JKA Network <contacto@jkanetwork.com>