diff --git a/modules/ROOT/pages/services/filesharing-nfs-installation.adoc b/modules/ROOT/pages/services/filesharing-nfs-installation.adoc
index f916b95..d97bfa6 100644
--- a/modules/ROOT/pages/services/filesharing-nfs-installation.adoc
+++ b/modules/ROOT/pages/services/filesharing-nfs-installation.adoc
@@ -228,7 +228,7 @@ You can use both options in parallel with the grand configuration file read in f
 
 === Configuration by example
 
-Example 1::
+Example ::
 Export the directory /srv/nfs/common with everyone, i.e. every network device and every user, can access with Read/Write and Synchronize access
 +
 [source,]
@@ -238,6 +238,7 @@ Export the directory /srv/nfs/common with everyone, i.e. every network device an
 /srv/nfs/common *(rw,sync)
 ----
 
+<<<<<<< HEAD
 Example 2::
 Export the directory /srv/nfs/common with everyone, i.e. every network device and every user, can access with Read/Write and Synchronize access
 +
@@ -278,6 +279,8 @@ Export the directory /srv/nfs/projects with all users of a specific network devi
 /srv/nfs/common *(rw,sync)
 ----
 
+=======
+>>>>>>> maartenl-maartenl-patch-1
 ==== Connection options
 
 Each default for every exported file system must be explicitly overridden. For example, if the rw option is not specified, then the exported file system is shared as read-only.