diff --git a/public_html/index.html b/public_html/index.html
index 2636f0e..36c4f66 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -1,41 +1,45 @@
-
-My tilde.club page
-
-
-
-
-~~~this is my tilde.club page~~~~
-
-Just log in with your secure internet shell to change this file!
-
-You may want to read: the tilde.club wiki for help.
-
-
-
-
-
-
-
-
-
-Click for the [
-Random page ]
-
-Want to join the ring? Click here for
-info.
-
-
-
-
-
-
+<<<<<<< HEAD
+
+
+ My tilde.club page
+
+
+
+
+
+ ~~~this is my tilde.club page~~~~
+ Just log in with your secure internet shell to change this file!
+ You may want to read: How to ~tilde; a n00b's primer for help.
+
+
+
+
+
+
+
+
+
+
+
+ Click for the [
+ Random page ]
+
+ Want to join the ring? Click here for
+ info.
+
+
+
+
+
+
+
-
-
+