diff --git a/journal/2021-12-19.md b/journal/2021-12-19.md
index df245657d..2e8ee8519 100644
--- a/journal/2021-12-19.md
+++ b/journal/2021-12-19.md
@@ -29,7 +29,4 @@
   - fixing the world is [[hard]] but [[simple]]
 - [[wikilinks]]
 - [[proteíno]]
-<<<<<<< HEAD
-- [[paul]]
-=======
->>>>>>> e9069ef9af56342b200d1f3338b075855bca5d05
+- [[paul]]
\ No newline at end of file
diff --git a/perhaps naive.md b/perhaps naive.md
index 5dc1c0349..43012a029 100644
--- a/perhaps naive.md	
+++ b/perhaps naive.md	
@@ -1,8 +1,12 @@
 # perhaps naive
 
-- [[pull]] [[flancia]] [[timeline]]
+- [[pull]] [[flancia]] [[timeline]] [[perhaps naĩve]]
 
-This is my take on why [[2021]] was a good year at the same time it was terrible for so many.
+This is my perhaps naive take on why [[2021]] was a good year at the same time it was terrible for so many.
 
 First of all, let's spare a minute for those who suffered or didn't make it. Let us do [[loving kindness]] for them and those that remain.
 
+Now let me tell you something. I think things are looking up on a few fronts. 
+
+First, it's becoming evident that humanity needs to learn how to deal with global risk together. It is becoming unavoidable. It will happen, and it seems evident to me that the best way to tackle the problems at hand is to 
+