diff --git a/contrib/man/fusiondirectory-insert-schema.1 b/contrib/man/fusiondirectory-insert-schema.1
index 39a7e4e9ff1129f69bebfee903e7cb6db3dfd579..c87c3a76e6c79394cb46c39e47f75276073ada67 100644
--- a/contrib/man/fusiondirectory-insert-schema.1
+++ b/contrib/man/fusiondirectory-insert-schema.1
@@ -133,7 +133,11 @@
 .\" ========================================================================
 .\"
 .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 0baa518bd3f5ce1a3f1cfb5579c8083a985be3b5..5dce9b7673cb6809d2a18e7303cadd10551b90b4 100644
--- a/contrib/man/fusiondirectory-setup.1
+++ b/contrib/man/fusiondirectory-setup.1
@@ -165,6 +165,9 @@ This option check your \s-1LDAP\s0 tree. Looking for admin account, and groups o
 .IP "\-\-migrate\-users" 4
 .IX Item "--migrate-users"
 This option add FusionDirectory attributes to the people branch.
+.IP "\-\-migrate\-dns" 4
+.IX Item "--migrate-dns"
+This option moves \s-1DNS\s0 zones from systems branch to \s-1DNS\s0 branch, which is necessary for FusionDirectory 1.0.10 and above.
 .IP "\-\-migrate\-acls" 4
 .IX Item "--migrate-acls"
 This option will migrated old GOsa style acl from 1.0.7 into FusionDirectory acl roles in 1.0.8
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index 315f5b646c5c02ccd87ec8d76192024d06f34418..48aff2593ed1a824922d399e16864fedaba9f1a9 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -133,7 +133,11 @@
 .\" ========================================================================
 .\"
 .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