diff --git a/dns.md b/dns.md
index 6f2070a30..7234bd939 100644
--- a/dns.md
+++ b/dns.md
@@ -1,6 +1,7 @@
 # dns
 
 - a [[system]].
+  - [[hierarchical]] [[decentralized]]
   - [[domain name system]]
     - [[wp]] https://en.wikipedia.org/wiki/Domain_Name_System
 - a [[thing]].
diff --git a/journal/2021-10-21.md b/journal/2021-10-21.md
index 795e491d1..f0e891810 100644
--- a/journal/2021-10-21.md
+++ b/journal/2021-10-21.md
@@ -13,7 +13,4 @@
   - [[robert axelrod]]
 - [[vanguard]]
 - [[mr green]]
-<<<<<<< HEAD
 - [[dns]]
-=======
->>>>>>> 8a8056487b9d732163fee1e659c50c74f5f542e8