diff --git a/puzzles/webapp/1/1.cgi b/puzzles/webapp/1/1.cgi
index 1d67510..91ddffd 100755
--- a/puzzles/webapp/1/1.cgi
+++ b/puzzles/webapp/1/1.cgi
@@ -10,11 +10,7 @@ print '''
1
-<<<<<<< HEAD:puzzles/webapp/1/1.cgi
-
-=======
->>>>>>> 3c3c03775e5ac9a11abf581fbf8656e31d99ef42:puzzles/webapp/1/1.cgi
diff --git a/puzzles/webapp/2/2.cgi b/puzzles/webapp/2/2.cgi
index ae0bee6..2f7249c 100755
--- a/puzzles/webapp/2/2.cgi
+++ b/puzzles/webapp/2/2.cgi
@@ -14,7 +14,7 @@ print '''
2
-
+
diff --git a/puzzles/webapp/3/3.cgi b/puzzles/webapp/3/3.cgi
index 4c347f0..0ac4e73 100755
--- a/puzzles/webapp/3/3.cgi
+++ b/puzzles/webapp/3/3.cgi
@@ -14,7 +14,7 @@ print '''
3
-
+
diff --git a/puzzles/webapp/4/4.cgi b/puzzles/webapp/4/4.cgi
index 052a6fd..efc188d 100755
--- a/puzzles/webapp/4/4.cgi
+++ b/puzzles/webapp/4/4.cgi
@@ -17,7 +17,7 @@ print '''
4
-
+