diff --git a/nwcommands.sthlp b/nwcommands.sthlp
index cd6f9e6..fe3e994 100755
--- a/nwcommands.sthlp
+++ b/nwcommands.sthlp
@@ -16,14 +16,8 @@
 
 {help nwinstall:{col 14}{bf:[NW-6]}{...}{col 31}{bf:Install Stata menus/dialogs}}
 
-
-<<<<<<< HEAD
 		*! Date        : 21march2015
 		*! Version     : 1.2.2
-=======
-		*! Date        : 20march2015
-		*! Version     : 1.2.1
->>>>>>> origin/master
 		*! Authors     : Thomas U. Grund 
 		*! Contact     : thomas.u.grund@gmail.com
 		*! Web         : {browse "http://nwcommands.org"}
diff --git a/nwinstall.sthlp b/nwinstall.sthlp
index b5d1faa..effda7c 100755
--- a/nwinstall.sthlp
+++ b/nwinstall.sthlp
@@ -18,11 +18,6 @@
 {opt permanently}
 {opt remove }
 {opt help}
-<<<<<<< HEAD
-{opt all}
-=======
-{opt all}
->>>>>>> origin/master
 {opth path(string)]
 
 
@@ -33,12 +28,8 @@
 {synopt:{opt permanently}}install the menu/dialogs permanently on your Stata{p_end}
 {synopt:{opt remove}}remove the "Network Analysis" menu from your Stata{p_end}
 {synopt:{opt help}}download the help files{p_end}
-{synopt:{opt all}}download the help files and dialog boxes and install them permanently{p_end}
-<<<<<<< HEAD
-{synopt:{opth path(string)}}directory where profile.do is installed; default SYSDIR_PERSONAL{p_end}
-=======
+{synopt:{opt all}}download the help files, dialog boxes, extensions and install them permanently{p_end}
 {synopt:{opth path(string)}}directory where profile.do is installed; default SYSDIR_PERSONAL{p_end}
->>>>>>> origin/master
 
 
 {title:Description}