diff --git a/cryptopunks.md b/cryptopunks.md
new file mode 100644
index 000000000..8789c129c
--- /dev/null
+++ b/cryptopunks.md
@@ -0,0 +1,6 @@
+# cryptopunks
+
+- a [[project]]
+  - [[nfts]] [[2016]]
+  - [[go]] https://www.larvalabs.com/cryptopunks
+
diff --git a/journal/2021-11-23.md b/journal/2021-11-23.md
index 76665305c..7c6c88425 100644
--- a/journal/2021-11-23.md
+++ b/journal/2021-11-23.md
@@ -1,6 +1,11 @@
 # 2021-11-23
 
+<<<<<<< HEAD
 - [[think tank]]
   - [[mondegreen]] [[think thank]]
 - [[roko]]
-- [[evan]] posted nice questions I want to answer today: https://twitter.com/Scaledish/status/1462940124141047808
\ No newline at end of file
+- [[evan]] posted nice questions I want to answer today: https://twitter.com/Scaledish/status/1462940124141047808
+=======
+- [[olof]] recommended [[the bureau]] ([[french]], [[2015]])
+  - [[birthday]] today!
+>>>>>>> 1001f897e1d807404718908e4dd593b19dc36060
diff --git a/journal/2021-11-24.md b/journal/2021-11-24.md
index 5fac28984..03213cb40 100644
--- a/journal/2021-11-24.md
+++ b/journal/2021-11-24.md
@@ -1,4 +1,5 @@
 # 2021-11-24
 
 - [[vera]]
-  - [[medito]]
\ No newline at end of file
+  - [[medito]]
+- TIL about [[cryptopunks]] and for some reason it depressed me a bit.
\ No newline at end of file