diff --git a/modules/ROOT/pages/services/filesharing-nfs-installation.adoc b/modules/ROOT/pages/services/filesharing-nfs-installation.adoc
index 9f70bc6..8abd5d1 100644
--- a/modules/ROOT/pages/services/filesharing-nfs-installation.adoc
+++ b/modules/ROOT/pages/services/filesharing-nfs-installation.adoc
@@ -73,13 +73,7 @@ As already stated, nfs does not provide user authentication. A common way is to
 +
 [source,]
 ----
-<<<<<<< HEAD
 […]$ sudo adduser -c 'nfs pseudo user' -b /nonexisting -M -r -s /sbin/nologin nfs
-||||||| 1fa76ff
-[…]$ sudo adduser -c 'nfs pseudo user' -m /nonexisting -M  -r  -s /sbin/nologin  nfs
-=======
-[…]$ sudo adduser -c 'nfs pseudo user' -M  -r  -s /sbin/nologin  nfs
->>>>>>> nfs-upd
 ----
 
 3. *Create and mount the required Logical Volumes*