diff --git a/chores.md b/chores.md
new file mode 100644
index 000000000..b3d284b52
--- /dev/null
+++ b/chores.md
@@ -0,0 +1,5 @@
+# chores
+
+- Things that are [[maintenance]] and can't be automated. 
+- Pushing entropy back; [[cleaning]], although cleaning can be fun.
+
diff --git a/clean the kitchen.md b/clean the kitchen.md
new file mode 100644
index 000000000..5d80dffb1
--- /dev/null
+++ b/clean the kitchen.md	
@@ -0,0 +1,4 @@
+# clean the kitchen
+
+- Cleaning the kitchen is one of my [[tasks]] in our household, and I try to enjoy it.
+
diff --git a/journal/2021-11-07.md b/journal/2021-11-07.md
index e391c3dfe..8b8413049 100644
--- a/journal/2021-11-07.md
+++ b/journal/2021-11-07.md
@@ -9,12 +9,10 @@
 - [[will]]
 - [[loas a buda]]
 - [[la censura de buddha]]
-<<<<<<< HEAD
   - [[short story]]
-- [[cannabis in buddhism]]
-=======
   - [[short story]] or [[essay]]?
   - [[buddha]] or [[buda]] == [[en]] or [[es]]
+- [[cannabis in buddhism]]
 - [[flancia]]
   - [[revolution]]
 - [[push]] [[virality]]
@@ -28,4 +26,5 @@
   - improve [[user pages]]: they are really bare now
   - fix tweet pulling, it seems broken?
     - oh, perhaps I disabled it for unbreaking org mode pages and I forgot?
->>>>>>> d201f4187567fa9d89b8e70a1686c8d4e4746c3a
+- [[push]] [[do]]
+  - [[clean the kitchen]]
diff --git a/tasks.md b/tasks.md
new file mode 100644
index 000000000..dc7e80ab3
--- /dev/null
+++ b/tasks.md
@@ -0,0 +1,6 @@
+# tasks
+
+- [[pull]] [[do]] [[later]] 
+- [[pull]] [[agora plan]]
+- [[pull]] [[chores]]
+