diff --git a/index.html b/index.html
index 7a81591..7df4eb5 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,10 @@ layout: base
diff --git a/phonebook/index.html b/phonebook/index.html
index 0e201a7..b1c83ed 100644
--- a/phonebook/index.html
+++ b/phonebook/index.html
@@ -27,10 +27,20 @@ title: phonebook
The community
+<<<<<<< HEAD
Want a tel.tilde.org.nz
number?
Click here for the registration form!
+=======
+ To get a tel.tilde.org.nz
number, please message darcy
+ in #tildetel
on the tilde.chat IRC.
+
+
+ If you had a tilde.tel
number, in most cases, you can use that number
+ on tel.tilde.org.nz
! Just let darcy
know when asking for
+ an account.
+>>>>>>> Revert "add "register" link to the homepage"
diff --git a/the-original/20210120-rip-tilde-tel.txt b/the-original/20210120-rip-tilde-tel.txt
index 5a6d1ad..ca6eb76 100644
--- a/the-original/20210120-rip-tilde-tel.txt
+++ b/the-original/20210120-rip-tilde-tel.txt
@@ -1,34 +1,34 @@
-----------------------------------------
-rip tilde.tel
-January 20th, 2021
-----------------------------------------
-
-yesterday, the almighty tilde.tel was shuttered.
-
-not gonna lie, by the time i found out, i was quite saddened.
-dammit, cat! now i've gotta go delete all my softphones! :p
-
-in all seriousness, despite its deadness, it was fun while it
-lasted.
-
-
-rest in peace, tilde.tel.
-
-
-
- ------
- / \
- / RIP \
- / \
-| TILDE.TEL |
-| |
-| 2019-2021 |
-| |
-| "ring ring, |
-| mother- |
-| fucker." |
-| |
-----------------
-
-
-
+----------------------------------------
+rip tilde.tel
+January 20th, 2021
+----------------------------------------
+
+yesterday, the almighty tilde.tel[1] was shuttered.
+
+not gonna lie, by the time i found out, i was quite saddened.
+dammit, cat! now i've gotta go delete all my softphones! :p
+
+in all seriousness, despite its deadness, it was fun while it
+lasted.
+
+
+rest in peace, tilde.tel.
+
+
+
+ ------
+ / \
+ / RIP \
+ / \
+| TILDE.TEL |
+| |
+| 2019-2021 |
+| |
+| "ring ring, |
+| mother- |
+| fucker." |
+| |
+----------------
+
+
+