diff --git a/friendly ambitious nerds.md b/friendly ambitious nerds.md
new file mode 100644
index 000000000..94a06910e
--- /dev/null
+++ b/friendly ambitious nerds.md	
@@ -0,0 +1,5 @@
+# friendly ambitious nerds
+
+- a [[list]].
+  - [[pull]] [[visakanv]]
+
diff --git a/journal/2021-10-21.md b/journal/2021-10-21.md
index 19323c224..29db0e78d 100644
--- a/journal/2021-10-21.md
+++ b/journal/2021-10-21.md
@@ -1,9 +1,7 @@
 # 2021-10-21
 
-<<<<<<< HEAD
 - [[nerd club]]
   - [[friendly ambitious nerds]]
-=======
 - [[carnivals]]
   - [[carnival]]
     - [[flancia]]
@@ -15,4 +13,3 @@
   - [[robert axelrod]]
 - [[vanguard]]
 - [[mr green]]
->>>>>>> f77966c32034a20e313b1c0befcc906f0d404742