diff --git a/journal/2021-08-14.md b/journal/2021-08-14.md
index b9560b40c..277525ef0 100644
--- a/journal/2021-08-14.md
+++ b/journal/2021-08-14.md
@@ -1,9 +1,7 @@
 # 2021-08-14
 
-<<<<<<< HEAD
 - [[agora]]
   - [[agora bot]]
     - [[twitter api]]
-=======
+  - [[async search]]
 - [[caiac]]
->>>>>>> 993a11ba5a0368d11fbff1e441216fec35b4b676