diff --git a/ma-web-to-other.sh b/ma-web-to-other.sh
index 49aeefe..e4185e8 100755
--- a/ma-web-to-other.sh
+++ b/ma-web-to-other.sh
@@ -4,11 +4,8 @@ sh /meta/s/scm/sdf/push-website.sh
 
 mkhomepg -p
 
-<<<<<<< HEAD
 chown -R scm:www /meta/www/s/scm
 
-=======
->>>>>>> 8386881c7a9832182fe279ceb8de1a069561f4df
 ssh scm@tty.sdf.org ksh /sdf/arpa/ns/s/scm/sdf/cluster-web-to-other.ksh
 
 chmod -R 755 /meta/gemini/scm