diff --git a/.index b/.index
index 62cc93a..7c8d856 100644
--- a/.index
+++ b/.index
@@ -228,3 +228,5 @@ esctta
 20260317.md
 20260323.md
 20260324.md
+20251230122347.todo.md
+20251230124758.md
diff --git a/20251230124758.md b/20251230124758.md
index e6cfed5..19a75f5 100644
--- a/20251230124758.md
+++ b/20251230124758.md
@@ -2,16 +2,20 @@
 
 #politics
 
+<<<<<<< HEAD
 <https://youtu.be/EJOrJUxIuTo?si=bM8nqKF1e280JC04>
 
 clearer thinking with spencer greenberg
 
 Nicholas Gruen
 
+=======
+>>>>>>> 7d82e91 ([nb] Commit)
 Sampling better than parties
 
 Democracy is about losers agreeing.
 
+<<<<<<< HEAD
 > The measure of a civilisation is the tools that we decide not to use against each other.
 
 > Democracy as we know it is a farce.
@@ -42,3 +46,12 @@ Micahel Fallony - tacit knowledge
 intelligence is adaptive capability
 
 scientism has us imitating science. Unitary vs competetive good
+=======
+
+
+
+https://youtu.be/EJOrJUxIuTo?si=bM8nqKF1e280JC04
+
+clearer thinking with spencer greenberg
+
+>>>>>>> 7d82e91 ([nb] Commit)