diff --git a/contrib/man/fusiondirectory-insert-schema.1 b/contrib/man/fusiondirectory-insert-schema.1
index c87c3a76e6c79394cb46c39e47f75276073ada67..39a7e4e9ff1129f69bebfee903e7cb6db3dfd579 100644
--- a/contrib/man/fusiondirectory-insert-schema.1
+++ b/contrib/man/fusiondirectory-insert-schema.1
@@ -133,11 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1"
-<<<<<<< HEAD
 .TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2016-06-23" "FusionDirectory 1.0.14" "FusionDirectory Documentation"
-=======
-.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2016-02-10" "FusionDirectory 1.0.10" "FusionDirectory Documentation"
->>>>>>> 483246f... Updating manpages for 1.0.10
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/contrib/man/fusiondirectory-setup.1 b/contrib/man/fusiondirectory-setup.1
index 5dce9b7673cb6809d2a18e7303cadd10551b90b4..c886285caf046e530f9dbc127ba662797f8b56fa 100644
--- a/contrib/man/fusiondirectory-setup.1
+++ b/contrib/man/fusiondirectory-setup.1
@@ -162,6 +162,9 @@ This option perform a check on FusionDirectory's config file.
 .IP "\-\-check\-ldap" 4
 .IX Item "--check-ldap"
 This option check your \s-1LDAP\s0 tree. Looking for admin account, and groups or people branch. If one of those don't exists, the script will ask you what to do.
+.IP "\-\-check\-ids" 4
+.IX Item "--check-ids"
+This option check your \s-1LDAP\s0 tree for duplicated uidNumber or gidNumber among users and groups.
 .IP "\-\-migrate\-users" 4
 .IX Item "--migrate-users"
 This option add FusionDirectory attributes to the people branch.
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index 48aff2593ed1a824922d399e16864fedaba9f1a9..315f5b646c5c02ccd87ec8d76192024d06f34418 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -133,11 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FUSIONDIRECTORY.CONF 1"
-<<<<<<< HEAD
 .TH FUSIONDIRECTORY.CONF 1 "2016-06-23" "FusionDirectory 1.0.14" "FusionDirectory Documentation"
-=======
-.TH FUSIONDIRECTORY.CONF 1 "2016-02-10" "FusionDirectory 1.0.10" "FusionDirectory Documentation"
->>>>>>> 483246f... Updating manpages for 1.0.10
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l