From 17ee97e7461bb774e5ef97220033589799b6c3c8 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Tue, 18 Nov 2025 09:42:29 +0200
Subject: Update content for html

---
 about/index.html     |  14 ---
 about/resources.html | 333 +++++++++++++--------------------------------------
 gemfeed/atom.xml     |  83 -------------
 index.html           |   6 +-
 uptime-stats.html    |  68 +----------
 5 files changed, 88 insertions(+), 416 deletions(-)

diff --git a/about/index.html b/about/index.html
index 41e34277..c5188473 100644
--- a/about/index.html
+++ b/about/index.html
@@ -43,23 +43,9 @@
 <br />
 <h2 style='display: inline' id='books'>Books</h2><br />
 <br />
-<<<<<<< HEAD
 <h3 style='display: inline' id='books-i-am-currently-reading--listening-4'>Books I am currently reading / listening (4)</h3><br />
-=======
-<h3 style='display: inline' id='books-i-am-currently-reading--listening'>Books I am currently reading / listening</h3><br />
 <br />
 <ul>
-<li>Seeking SRE: Conversations About Running Production Systems at Scale; David N. Blank-Edelman; eBook (Kobo kePub)</li>
-<li>How to talk so kids will listen &amp; Listen so kids will talk; Audiobook (Audible)</li>
-<li>2005 - Okular; Alastair Reynolds; eBook (Kobo kePub)</li>
-<li>2021 - Inhibitor Phase; Alastair Reynolds; Audiobook (Libro.fm)</li>
-</ul><br />
-<h3 style='display: inline' id='next-books-already-in-my-shelf'>Next books already in my shelf</h3><br />
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
-<br />
-<ul>
-<li>Clean Code; Audiobook (Audible)</li>
-<li>Bash it out</li>
 <li>97 Things Every Cloud Engineer Should Know: Collective Wisdom from the Experts; Emily Freeman, Nathen Harvey; eBook (ePub)</li>
 <li>How to talk so kids will listen &amp; Listen so kids will talk; Audiobook (Audible)</li>
 <li>2005 - Okular; Alastair Reynolds; eBook (Kobo kePub)</li>
diff --git a/about/resources.html b/about/resources.html
index 9cde34b5..2e0a5c8c 100644
--- a/about/resources.html
+++ b/about/resources.html
@@ -50,212 +50,112 @@
 <span>In random order:</span><br />
 <br />
 <ul>
-<<<<<<< HEAD
-<li>The KCNA (Kubernetes and Cloud Native Associate) Book; Nigel Poulton</li>
+<li>Site Reliability Engineering; How Google runs production systems; O&#39;Reilly</li>
+<li>Funktionale Programmierung; Peter Pepper; Springer</li>
+<li>C++ Programming Language; Bjarne Stroustrup;</li>
+<li>DNS and BIND; Cricket Liu; O&#39;Reilly</li>
 <li>Learn You a Haskell for Great Good!; Miran Lipovaca; No Starch Press</li>
-<li>Tmux 2: Productive Mouse-free Development; Brain P. Hogan; The Pragmatic Programmers </li>
-<li>Higher Order Perl; Mark Dominus; Morgan Kaufmann</li>
-<li>Seeking SRE: Conversations About Running Production Systems at Scale; David N. Blank-Edelman; eBook</li>
-<li>Object-Oriented Programming with ANSI-C; Axel-Tobias Schreiner</li>
-<li>The DevOps Handbook; Gene Kim, Jez Humble, Patrick Debois, John Willis; Audible</li>
+<li>Go Brain Teasers - Exercise Your Mind; Miki Tebeka; The Pragmatic Programmers</li>
+<li>Effective awk programming; Arnold Robbins; O&#39;Reilly</li>
+<li>Pro Puppet; James Turnbull, Jeffrey McCune; Apress</li>
 <li>Clusterbau mit Linux-HA; Michael Schwartzkopff; O&#39;Reilly</li>
-<li>DNS and BIND; Cricket Liu; O&#39;Reilly</li>
-<li>100 Go Mistakes and How to Avoid Them; Teiva Harsanyi; Manning Publications</li>
-<li>Distributed Systems: Principles and Paradigms; Andrew S. Tanenbaum; Pearson</li>
-<li>The Pragmatic Programmer; David Thomas; Addison-Wesley</li>
-<li>Programming Ruby 3.3 (5th Edition); Noel Rappin, with Dave Thomas; The Pragmatic Bookshelf</li>
-<li>Hands-on Infrastructure Monitoring with Prometheus; Joel Bastos, Pedro Araujo; Packt </li>
-<li>Raku Fundamentals; Moritz Lenz; Apress</li>
-<li>Modern Perl; Chromatic ; Onyx Neon Press</li>
-<li>Raku Recipes; J.J. Merelo; Apress</li>
-<li>Amazon Web Services in Action; Michael Wittig and Andreas Wittig; Manning Publications</li>
-<li>Think Raku (aka Think Perl 6); Laurent Rosenfeld, Allen B. Downey; O&#39;Reilly</li>
 <li>The Go Programming Language; Alan A. A. Donovan; Addison-Wesley Professional</li>
-<li>The Kubernetes Book; Nigel Poulton; Unabridged Audiobook</li>
-<li>The Docker Book; James Turnbull; Kindle</li>
-<li>Data Science at the Command Line; Jeroen Janssens; O&#39;Reilly</li>
-<li>Effective Java; Joshua Bloch; Addison-Wesley Professional</li>
-<li>Systemprogrammierung in Go; Frank Müller; dpunkt</li>
+<li>The Practise of System and Network Administration; Thomas A. Limoncelli, Christina J. Hogan, Strata R. Chalup; Addison-Wesley Professional Pro Git; Scott Chacon, Ben Straub; Apress</li>
+<li>Ultimate Go Notebook; Bill Kennedy</li>
+<li>Hands-on Infrastructure Monitoring with Prometheus; Joel Bastos, Pedro Araujo; Packt </li>
+<li>The KCNA (Kubernetes and Cloud Native Associate) Book; Nigel Poulton</li>
+<li>Systems Performance Tuning; Gian-Paolo D. Musumeci and others...; O&#39;Reilly</li>
 <li>Concurrency in Go; Katherine Cox-Buday; O&#39;Reilly</li>
-<li>Go Brain Teasers - Exercise Your Mind; Miki Tebeka; The Pragmatic Programmers</li>
-<li>Perl New Features; Joshua McAdams, brian d foy; Perl School</li>
-<li>Leanring eBPF; Liz Rice; O&#39;Reilly</li>
-<li>Chaos Engineering - System Resiliency in Practice; Casey Rosenthal and Nora Jones; eBook</li>
-<li>Funktionale Programmierung; Peter Pepper; Springer</li>
+<li>Modern Perl; Chromatic ; Onyx Neon Press</li>
 <li>Kubernetes Cookbook; Sameer Naik, Sébastien Goasguen, Jonathan Michaux; O&#39;Reilly</li>
-<li>Systems Performance Tuning; Gian-Paolo D. Musumeci and others...; O&#39;Reilly</li>
-<li>Terraform Cookbook; Mikael Krief; Packt Publishing</li>
-<li>Site Reliability Engineering; How Google runs production systems; O&#39;Reilly</li>
-<li>21st Century C: C Tips from the New School; Ben Klemens; O&#39;Reilly</li>
-<li>Ultimate Go Notebook; Bill Kennedy</li>
-<li>Pro Puppet; James Turnbull, Jeffrey McCune; Apress</li>
+<li>The Pragmatic Programmer; David Thomas; Addison-Wesley</li>
 <li>Learn You Some Erlang for Great Good; Fred Herbert; No Starch Press</li>
-<li>Polished Ruby Programming; Jeremy Evans; Packt Publishing</li>
-<li>Java ist auch eine Insel; Christian Ullenboom; </li>
-<li>Effective awk programming; Arnold Robbins; O&#39;Reilly</li>
-<li>The Practise of System and Network Administration; Thomas A. Limoncelli, Christina J. Hogan, Strata R. Chalup; Addison-Wesley Professional Pro Git; Scott Chacon, Ben Straub; Apress</li>
-<li>C++ Programming Language; Bjarne Stroustrup;</li>
+<li>Programming Ruby 3.3 (5th Edition); Noel Rappin, with Dave Thomas; The Pragmatic Bookshelf</li>
+<li>21st Century C: C Tips from the New School; Ben Klemens; O&#39;Reilly</li>
 <li>Developing Games in Java; David Brackeen and others...; New Riders</li>
-<li>DevOps And Site Reliability Engineering Handbook; Stephen Fleming; Audible</li>
-<li>97 things every SRE should know; Emil Stolarsky, Jaime Woo; O&#39;Reilly</li>
-<li>Programming Perl aka "The Camel Book"; Tom Christiansen, brian d foy, Larry Wall &amp; Jon Orwant; O&#39;Reilly</li>
-=======
-<li>Higher Order Perl; Mark Dominus; Morgan Kaufmann</li>
 <li>The DevOps Handbook; Gene Kim, Jez Humble, Patrick Debois, John Willis; Audible</li>
-<li>Polished Ruby Programming; Jeremy Evans; Packt Publishing</li>
-<li>Developing Games in Java; David Brackeen and others...; New Riders</li>
-<li>C++ Programming Language; Bjarne Stroustrup;</li>
-<li>Clusterbau mit Linux-HA; Michael Schwartzkopff; O&#39;Reilly</li>
-<li>Effective Java; Joshua Bloch; Addison-Wesley Professional</li>
+<li>Terraform Cookbook; Mikael Krief; Packt Publishing</li>
 <li>Java ist auch eine Insel; Christian Ullenboom; </li>
-<li>97 things every SRE should know; Emil Stolarsky, Jaime Woo; O&#39;Reilly</li>
-<li>Effective awk programming; Arnold Robbins; O&#39;Reilly</li>
-<li>The Go Programming Language; Alan A. A. Donovan; Addison-Wesley Professional</li>
-<li>Programming Perl aka "The Camel Book"; Tom Christiansen, brian d foy, Larry Wall &amp; Jon Orwant; O&#39;Reilly</li>
-<li>Distributed Systems: Principles and Paradigms; Andrew S. Tanenbaum; Pearson</li>
+<li>Perl New Features; Joshua McAdams, brian d foy; Perl School</li>
 <li>The Docker Book; James Turnbull; Kindle</li>
-<li>The KCNA (Kubernetes and Cloud Native Associate) Book; Nigel Poulton</li>
-<li>Systemprogrammierung in Go; Frank Müller; dpunkt</li>
+<li>Higher Order Perl; Mark Dominus; Morgan Kaufmann</li>
+<li>The Kubernetes Book; Nigel Poulton; Unabridged Audiobook</li>
 <li>Think Raku (aka Think Perl 6); Laurent Rosenfeld, Allen B. Downey; O&#39;Reilly</li>
-<li>Funktionale Programmierung; Peter Pepper; Springer</li>
-<li>Kubernetes Cookbook; Sameer Naik, Sébastien Goasguen, Jonathan Michaux; O&#39;Reilly</li>
-<li>100 Go Mistakes and How to Avoid Them; Teiva Harsanyi; Manning Publications</li>
-<li>Amazon Web Services in Action; Michael Wittig and Andreas Wittig; Manning Publications</li>
-<li>Raku Fundamentals; Moritz Lenz; Apress</li>
 <li>Tmux 2: Productive Mouse-free Development; Brain P. Hogan; The Pragmatic Programmers </li>
-<li>Raku Recipes; J.J. Merelo; Apress</li>
-<li>The Kubernetes Book; Nigel Poulton; Unabridged Audiobook</li>
-<li>Perl New Features; Joshua McAdams, brian d foy; Perl School</li>
-<li>Modern Perl; Chromatic ; Onyx Neon Press</li>
-<li>Terraform Cookbook; Mikael Krief; Packt Publishing</li>
-<li>Go Brain Teasers - Exercise Your Mind; Miki Tebeka; The Pragmatic Programmers</li>
-<li>Programming Ruby 3.3 (5th Edition); Noel Rappin, with Dave Thomas; The Pragmatic Bookshelf</li>
+<li>DevOps And Site Reliability Engineering Handbook; Stephen Fleming; Audible</li>
+<li>Data Science at the Command Line; Jeroen Janssens; O&#39;Reilly</li>
+<li>Raku Fundamentals; Moritz Lenz; Apress</li>
+<li>Effective Java; Joshua Bloch; Addison-Wesley Professional</li>
+<li>100 Go Mistakes and How to Avoid Them; Teiva Harsanyi; Manning Publications</li>
 <li>Leanring eBPF; Liz Rice; O&#39;Reilly</li>
-<li>Pro Puppet; James Turnbull, Jeffrey McCune; Apress</li>
-<li>DNS and BIND; Cricket Liu; O&#39;Reilly</li>
+<li>97 things every SRE should know; Emil Stolarsky, Jaime Woo; O&#39;Reilly</li>
+<li>Programming Perl aka "The Camel Book"; Tom Christiansen, brian d foy, Larry Wall &amp; Jon Orwant; O&#39;Reilly</li>
+<li>Raku Recipes; J.J. Merelo; Apress</li>
+<li>Amazon Web Services in Action; Michael Wittig and Andreas Wittig; Manning Publications</li>
 <li>Object-Oriented Programming with ANSI-C; Axel-Tobias Schreiner</li>
-<li>Ultimate Go Notebook; Bill Kennedy</li>
-<li>Site Reliability Engineering; How Google runs production systems; O&#39;Reilly</li>
-<li>Learn You a Haskell for Great Good!; Miran Lipovaca; No Starch Press</li>
-<li>The Pragmatic Programmer; David Thomas; Addison-Wesley</li>
-<li>Hands-on Infrastructure Monitoring with Prometheus; Joel Bastos, Pedro Araujo; Packt </li>
-<li>Systems Performance Tuning; Gian-Paolo D. Musumeci and others...; O&#39;Reilly</li>
+<li>Distributed Systems: Principles and Paradigms; Andrew S. Tanenbaum; Pearson</li>
+<li>Polished Ruby Programming; Jeremy Evans; Packt Publishing</li>
+<li>Seeking SRE: Conversations About Running Production Systems at Scale; David N. Blank-Edelman; eBook</li>
 <li>Chaos Engineering - System Resiliency in Practice; Casey Rosenthal and Nora Jones; eBook</li>
-<li>Learn You Some Erlang for Great Good; Fred Herbert; No Starch Press</li>
-<li>Data Science at the Command Line; Jeroen Janssens; O&#39;Reilly</li>
-<li>Concurrency in Go; Katherine Cox-Buday; O&#39;Reilly</li>
-<li>The Practise of System and Network Administration; Thomas A. Limoncelli, Christina J. Hogan, Strata R. Chalup; Addison-Wesley Professional Pro Git; Scott Chacon, Ben Straub; Apress</li>
-<li>21st Century C: C Tips from the New School; Ben Klemens; O&#39;Reilly</li>
-<li>DevOps And Site Reliability Engineering Handbook; Stephen Fleming; Audible</li>
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
+<li>Systemprogrammierung in Go; Frank Müller; dpunkt</li>
 </ul><br />
 <h2 style='display: inline' id='technical-references'>Technical references</h2><br />
 <br />
 <span>I didn&#39;t read them from the beginning to the end, but I am using them to look up things. The books are in random order:</span><br />
 <br />
 <ul>
-<li>Groovy Kurz &amp; Gut; Joerg Staudemeier; O&#39;Reilly</li>
-<<<<<<< HEAD
-<li>Relayd and Httpd Mastery; Michael W Lucas</li>
-<li>Understanding the Linux Kernel; Daniel P. Bovet, Marco Cesati; O&#39;Reilly</li>
-<li>Go: Design Patterns for Real-World Projects; Mat Ryer; Packt</li>
-<li>Implementing Service Level Objectives; Alex Hidalgo; O&#39;Reilly</li>
 <li>Algorithms; Robert Sedgewick, Kevin Wayne; Addison Wesley</li>
-<li>The Linux Programming Interface; Michael Kerrisk; No Starch Press </li>
+<li>Groovy Kurz &amp; Gut; Joerg Staudemeier; O&#39;Reilly</li>
 <li>BPF Performance Tools - Linux System and Application Observability, Brendan Gregg; Addison Wesley</li>
-=======
+<li>Understanding the Linux Kernel; Daniel P. Bovet, Marco Cesati; O&#39;Reilly</li>
 <li>Go: Design Patterns for Real-World Projects; Mat Ryer; Packt</li>
+<li>Relayd and Httpd Mastery; Michael W Lucas</li>
 <li>Implementing Service Level Objectives; Alex Hidalgo; O&#39;Reilly</li>
-<li>Algorithms; Robert Sedgewick, Kevin Wayne; Addison Wesley</li>
-<li>Understanding the Linux Kernel; Daniel P. Bovet, Marco Cesati; O&#39;Reilly</li>
-<li>BPF Performance Tools - Linux System and Application Observability, Brendan Gregg; Addison Wesley</li>
 <li>The Linux Programming Interface; Michael Kerrisk; No Starch Press </li>
-<li>Relayd and Httpd Mastery; Michael W Lucas</li>
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 </ul><br />
 <h2 style='display: inline' id='self-development-and-soft-skills-books'>Self-development and soft-skills books</h2><br />
 <br />
 <span>In random order:</span><br />
 <br />
 <ul>
-<li>The 7 Habits Of Highly Effective People; Stephen R. Covey; Simon &amp; Schuster UK</li>
 <li>The Software Engineer&#39;s Guidebook: Navigating senior, tech lead, and staff engineer positions at tech companies and startups; Gergely Orosz; Audiobook </li>
-<<<<<<< HEAD
-<li>Slow Productivity; Cal Newport; Penguin Random House</li>
-<li>Influence without Authority; A. Cohen, D. Bradford; Wiley</li>
-<li>Buddah and Einstein walk into a Bar; Guy Joseph Ale, Claire Bloom; Blackstone Publishing</li>
-<li>Soft Skills; John Sommez; Manning Publications</li>
-<li>Meditation for Mortals, Oliver Burkeman, Audiobook</li>
-<li>Never Split the Difference; Chris Voss, Tahl Raz; Random House Business</li>
-<li>Getting Things Done; David Allen</li>
-<li>The Phoenix Project - A Novel About IT, DevOps, and Helping your Business Win; Gene Kim and Kevin Behr; Trade Select</li>
-<li>Stop starting, start finishing; Arne Roock; Lean-Kanban University  </li>
-<li>Eat That Frog!; Brian Tracy; Hodder Paperbacks</li>
-<li>The Courage to Be Disliked; Ichiro Kishimi and Fumitake Koga; Audiobook</li>
-<li>Who Moved My Cheese?; Dr. Spencer Johnson; Vermilion</li>
-<li>The Obstacle Is The Way; Ryan Holiday; Profile Books Ltd</li>
-<li>Staff Engineer: Leadership beyond the management track; Will Larson; Audiobook</li>
-<li>Search Inside Yourself - The Unexpected path to Achieving Success, Happiness (and World Peace); Chade-Meng Tan, Daniel Goleman, Jon Kabat-Zinn; HarperOne</li>
-<li>Ultralearning; Scott Young; Thorsons</li>
-<li>97 Things Every Engineering Manager Should Know; Camille Fournier; Audiobook</li>
 <li>Time Management for System Administrators; Thomas A. Limoncelli; O&#39;Reilly</li>
+<li>The 7 Habits Of Highly Effective People; Stephen R. Covey; Simon &amp; Schuster UK</li>
 <li>The Bullet Journal Method; Ryder Carroll; Fourth Estate</li>
-<li>Atomic Habits; James Clear; Random House Business</li>
-<li>Digital Minimalism; Cal Newport; Portofolio Penguin</li>
 <li>The Off Switch; Mark Cropley; Virgin Books (RE-READ 1ST TIME)</li>
-<li>Ultralearning; Anna Laurent; Self-published via Amazon</li>
-<li>Consciousness: A Very Short Introduction; Susan Blackmore; Oxford Uiversity Press</li>
-<li>Coders at Work - Reflections on the craft of programming, Peter Seibel and Mitchell Dorian et al., Audiobook</li>
-<li>101 Essays that change the way you think; Brianna Wiest; Audiobook</li>
 <li>So Good They Can&#39;t Ignore You; Cal Newport; Business Plus</li>
-<li>The Power of Now; Eckhard Tolle; Yellow Kite</li>
-<li>The Daily Stoic; Ryan Holiday, Stephen Hanselman; Profile Books</li>
 <li>Deep Work; Cal Newport; Piatkus</li>
-<li>Psycho-Cybernetics; Maxwell Maltz; Perigee Books</li>
-<li>The Complete Software Developer&#39;s Career Guide; John Sonmez; Unabridged Audiobook</li>
+<li>Ultralearning; Scott Young; Thorsons</li>
+<li>The Phoenix Project - A Novel About IT, DevOps, and Helping your Business Win; Gene Kim and Kevin Behr; Trade Select</li>
+<li>Staff Engineer: Leadership beyond the management track; Will Larson; Audiobook</li>
+<li>Never Split the Difference; Chris Voss, Tahl Raz; Random House Business</li>
+<li>Stop starting, start finishing; Arne Roock; Lean-Kanban University  </li>
 <li>Eat That Frog; Brian Tracy</li>
-<li>Solve for Happy; Mo Gawdat (RE-READ 1ST TIME)</li>
-<li>The Joy of Missing Out; Christina Crook; New Society Publishers</li>
 <li>The Good Enough Job; Simone Stolzoff; Ebury Edge</li>
-=======
+<li>Consciousness: A Very Short Introduction; Susan Blackmore; Oxford Uiversity Press</li>
+<li>The Complete Software Developer&#39;s Career Guide; John Sonmez; Unabridged Audiobook</li>
 <li>Digital Minimalism; Cal Newport; Portofolio Penguin</li>
-<li>The Obstacle Is The Way; Ryan Holiday; Profile Books Ltd</li>
+<li>The Daily Stoic; Ryan Holiday, Stephen Hanselman; Profile Books</li>
+<li>The Power of Now; Eckhard Tolle; Yellow Kite</li>
+<li>Influence without Authority; A. Cohen, D. Bradford; Wiley</li>
+<li>Meditation for Mortals, Oliver Burkeman, Audiobook</li>
+<li>Getting Things Done; David Allen</li>
+<li>Eat That Frog!; Brian Tracy; Hodder Paperbacks</li>
+<li>Buddah and Einstein walk into a Bar; Guy Joseph Ale, Claire Bloom; Blackstone Publishing</li>
 <li>Slow Productivity; Cal Newport; Penguin Random House</li>
-<li>So Good They Can&#39;t Ignore You; Cal Newport; Business Plus</li>
+<li>The Obstacle Is The Way; Ryan Holiday; Profile Books Ltd</li>
 <li>Soft Skills; John Sommez; Manning Publications</li>
-<li>Time Management for System Administrators; Thomas A. Limoncelli; O&#39;Reilly</li>
-<li>The Good Enough Job; Simone Stolzoff; Ebury Edge</li>
 <li>The Joy of Missing Out; Christina Crook; New Society Publishers</li>
-<li>The Daily Stoic; Ryan Holiday, Stephen Hanselman; Profile Books</li>
-<li>Ultralearning; Scott Young; Thorsons</li>
-<li>Eat That Frog!; Brian Tracy; Hodder Paperbacks</li>
-<li>The Power of Now; Eckhard Tolle; Yellow Kite</li>
+<li>97 Things Every Engineering Manager Should Know; Camille Fournier; Audiobook</li>
+<li>The Courage to Be Disliked; Ichiro Kishimi and Fumitake Koga; Audiobook</li>
 <li>Coders at Work - Reflections on the craft of programming, Peter Seibel and Mitchell Dorian et al., Audiobook</li>
 <li>Search Inside Yourself - The Unexpected path to Achieving Success, Happiness (and World Peace); Chade-Meng Tan, Daniel Goleman, Jon Kabat-Zinn; HarperOne</li>
-<li>The 7 Habits Of Highly Effective People; Stephen R. Covey; Simon &amp; Schuster UK</li>
-<li>97 Things Every Engineering Manager Should Know; Camille Fournier; Audiobook</li>
-<li>Buddah and Einstein walk into a Bar; Guy Joseph Ale, Claire Bloom; Blackstone Publishing</li>
-<li>The Off Switch; Mark Cropley; Virgin Books (RE-READ 1ST TIME)</li>
-<li>Consciousness: A Very Short Introduction; Susan Blackmore; Oxford Uiversity Press</li>
-<li>Eat That Frog; Brian Tracy</li>
-<li>Never Split the Difference; Chris Voss, Tahl Raz; Random House Business</li>
-<li>Stop starting, start finishing; Arne Roock; Lean-Kanban University  </li>
-<li>Staff Engineer: Leadership beyond the management track; Will Larson; Audiobook</li>
+<li>101 Essays that change the way you think; Brianna Wiest; Audiobook</li>
 <li>Who Moved My Cheese?; Dr. Spencer Johnson; Vermilion</li>
-<li>Influence without Authority; A. Cohen, D. Bradford; Wiley</li>
-<li>Deep Work; Cal Newport; Piatkus</li>
-<li>Atomic Habits; James Clear; Random House Business</li>
-<li>Ultralearning; Anna Laurent; Self-published via Amazon</li>
-<li>Meditation for Mortals, Oliver Burkeman, Audiobook</li>
 <li>Solve for Happy; Mo Gawdat (RE-READ 1ST TIME)</li>
-<li>The Phoenix Project - A Novel About IT, DevOps, and Helping your Business Win; Gene Kim and Kevin Behr; Trade Select</li>
 <li>Psycho-Cybernetics; Maxwell Maltz; Perigee Books</li>
-<li>101 Essays that change the way you think; Brianna Wiest; Audiobook</li>
-<li>The Courage to Be Disliked; Ichiro Kishimi and Fumitake Koga; Audiobook</li>
-<li>The Bullet Journal Method; Ryder Carroll; Fourth Estate</li>
-<li>The Complete Software Developer&#39;s Career Guide; John Sonmez; Unabridged Audiobook</li>
-<li>Getting Things Done; David Allen</li>
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
+<li>Ultralearning; Anna Laurent; Self-published via Amazon</li>
+<li>Atomic Habits; James Clear; Random House Business</li>
 </ul><br />
 <a class='textlink' href='../notes/index.html'>Here are notes of mine for some of the books</a><br />
 <br />
@@ -264,55 +164,31 @@
 <span>Some of these were in-person with exams; others were online learning lectures only. In random order:</span><br />
 <br />
 <ul>
-<<<<<<< HEAD
+<li>Ultimate Go Programming; Bill Kennedy; O&#39;Reilly Online</li>
+<li>Apache Tomcat Best Practises; 3-day on-site training</li>
+<li>Protocol buffers; O&#39;Reilly Online</li>
+<li>Developing IaC with Terraform (with Live Lessons); O&#39;Reilly Online</li>
+<li>AWS Immersion Day; Amazon; 1-day interactive online training </li>
+<li>The Well-Grounded Rubyist Video Edition; David. A. Black; O&#39;Reilly Online</li>
 <li>Algorithms Video Lectures; Robert Sedgewick; O&#39;Reilly Online</li>
 <li>Linux Security and Isolation APIs Training; Michael Kerrisk; 3-day on-site training</li>
-<li>Developing IaC with Terraform (with Live Lessons); O&#39;Reilly Online</li>
-<li>Structure and Interpretation of Computer Programs; Harold Abelson and more...; </li>
 <li>The Ultimate Kubernetes Bootcamp; School of Devops; O&#39;Reilly Online</li>
-<li>Protocol buffers; O&#39;Reilly Online</li>
-<li>Scripting Vim; Damian Conway; O&#39;Reilly Online</li>
 <li>F5 Loadbalancers Training; 2-day on-site training; F5, Inc. </li>
 <li>Red Hat Certified System Administrator; Course + certification (Although I had the option, I decided not to take the next course as it is more effective to self learn what I need)</li>
-<li>AWS Immersion Day; Amazon; 1-day interactive online training </li>
-<li>Functional programming lecture; Remote University of Hagen</li>
-<li>Cloud Operations on AWS - Learn how to configure, deploy, maintain, and troubleshoot your AWS environments; 3-day online live training with labs; Amazon</li>
-<li>Ultimate Go Programming; Bill Kennedy; O&#39;Reilly Online</li>
-<li>The Well-Grounded Rubyist Video Edition; David. A. Black; O&#39;Reilly Online</li>
-<li>Apache Tomcat Best Practises; 3-day on-site training</li>
-=======
-<li>Red Hat Certified System Administrator; Course + certification (Although I had the option, I decided not to take the next course as it is more effective to self learn what I need)</li>
-<li>Cloud Operations on AWS - Learn how to configure, deploy, maintain, and troubleshoot your AWS environments; 3-day online live training with labs; Amazon</li>
-<li>Scripting Vim; Damian Conway; O&#39;Reilly Online</li>
-<li>F5 Loadbalancers Training; 2-day on-site training; F5, Inc. </li>
-<li>AWS Immersion Day; Amazon; 1-day interactive online training </li>
-<li>Ultimate Go Programming; Bill Kennedy; O&#39;Reilly Online</li>
-<li>Apache Tomcat Best Practises; 3-day on-site training</li>
+<li>MySQL Deep Dive Workshop; 2-day on-site training</li>
 <li>Structure and Interpretation of Computer Programs; Harold Abelson and more...; </li>
-<li>Algorithms Video Lectures; Robert Sedgewick; O&#39;Reilly Online</li>
-<li>The Ultimate Kubernetes Bootcamp; School of Devops; O&#39;Reilly Online</li>
-<li>Protocol buffers; O&#39;Reilly Online</li>
+<li>Cloud Operations on AWS - Learn how to configure, deploy, maintain, and troubleshoot your AWS environments; 3-day online live training with labs; Amazon</li>
 <li>Functional programming lecture; Remote University of Hagen</li>
-<li>The Well-Grounded Rubyist Video Edition; David. A. Black; O&#39;Reilly Online</li>
-<li>Developing IaC with Terraform (with Live Lessons); O&#39;Reilly Online</li>
-<li>Linux Security and Isolation APIs Training; Michael Kerrisk; 3-day on-site training</li>
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
-<li>MySQL Deep Dive Workshop; 2-day on-site training</li>
+<li>Scripting Vim; Damian Conway; O&#39;Reilly Online</li>
 </ul><br />
 <h2 style='display: inline' id='technical-guides'>Technical guides</h2><br />
 <br />
 <span>These are not whole books, but guides (smaller or larger) which I found very useful. in random order:</span><br />
 <br />
 <ul>
-<<<<<<< HEAD
-<li>Raku Guide at https://raku.guide  </li>
-<li>How CPUs work at https://cpu.land</li>
-<li>Advanced Bash-Scripting Guide </li>
-=======
 <li>Advanced Bash-Scripting Guide </li>
 <li>How CPUs work at https://cpu.land</li>
 <li>Raku Guide at https://raku.guide  </li>
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 </ul><br />
 <h2 style='display: inline' id='podcasts'>Podcasts</h2><br />
 <br />
@@ -321,106 +197,61 @@
 <span>In random order:</span><br />
 <br />
 <ul>
-<<<<<<< HEAD
-<li>Fork Around And Find Out</li>
-<li>Fallthrough [Golang]</li>
-<li>Deep Questions with Cal Newport</li>
-<li>BSD Now [BSD]</li>
 <li>Dev Interrupted</li>
-<li>Pratical AI</li>
-<li>Modern Mentor</li>
-<li>The Pragmatic Engineer Podcast</li>
-<li>Wednesday Wisdom</li>
-<li>Backend Banter</li>
 <li>Maintainable</li>
-<li>The Changelog Podcast(s)</li>
-<li>Cup o&#39; Go [Golang]</li>
-<li>The ProdCast (Google SRE Podcast)</li>
-<li>Hidden Brain</li>
-=======
-<li>Cup o&#39; Go [Golang]</li>
 <li>The Pragmatic Engineer Podcast</li>
-<li>Wednesday Wisdom</li>
+<li>The ProdCast (Google SRE Podcast)</li>
+<li>BSD Now [BSD]</li>
+<li>Modern Mentor</li>
 <li>Backend Banter</li>
 <li>Fallthrough [Golang]</li>
+<li>Wednesday Wisdom</li>
 <li>Deep Questions with Cal Newport</li>
-<li>Maintainable</li>
-<li>The ProdCast (Google SRE Podcast)</li>
-<li>Dev Interrupted</li>
+<li>Cup o&#39; Go [Golang]</li>
 <li>Hidden Brain</li>
-<li>The Changelog Podcast(s)</li>
-<li>BSD Now [BSD]</li>
-<li>Fork Around And Find Out</li>
-<li>Modern Mentor</li>
 <li>Pratical AI</li>
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
+<li>Fork Around And Find Out</li>
+<li>The Changelog Podcast(s)</li>
 </ul><br />
 <h3 style='display: inline' id='podcasts-i-liked'>Podcasts I liked</h3><br />
 <br />
 <span>I liked them but am not listening to them anymore. The podcasts have either "finished" (no more episodes) or I stopped listening to them due to time constraints or a shift in my interests.</span><br />
 <br />
 <ul>
-<<<<<<< HEAD
-<li>FLOSS weekly</li>
-<li>Java Pub House</li>
-<li>Ship It (predecessor of Fork Around And Find Out)</li>
 <li>Go Time (predecessor of fallthrough)</li>
-<li>CRE: Chaosradio Express [german]</li>
-<li>Modern Mentor</li>
-=======
+<li>Ship It (predecessor of Fork Around And Find Out)</li>
 <li>Modern Mentor</li>
-<li>Go Time (predecessor of fallthrough)</li>
 <li>Java Pub House</li>
-<li>FLOSS weekly</li>
 <li>CRE: Chaosradio Express [german]</li>
-<li>Ship It (predecessor of Fork Around And Find Out)</li>
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
+<li>FLOSS weekly</li>
 </ul><br />
 <h2 style='display: inline' id='newsletters-i-like'>Newsletters I like</h2><br />
 <br />
 <span>This is a mix of tech and non-tech newsletters I am subscribed to. In random order:</span><br />
 <br />
 <ul>
+<li>Register Spill</li>
+<li>VK Newsletter</li>
+<li>Applied Go Weekly Newsletter</li>
 <li>The Imperfectionist</li>
-<<<<<<< HEAD
+<li>Andreas Brandhorst Newsletter (Sci-Fi author)</li>
+<li>Golang Weekly</li>
 <li>Monospace Mentor</li>
-<li>The Valuable Dev</li>
+<li>Ruby Weekly</li>
 <li>byteSizeGo</li>
-<li>Applied Go Weekly Newsletter</li>
-<li>Golang Weekly</li>
 <li>Changelog News</li>
-=======
-<li>Andreas Brandhorst Newsletter (Sci-Fi author)</li>
-<li>Applied Go Weekly Newsletter</li>
-<li>Register Spill</li>
 <li>The Pragmatic Engineer</li>
-<li>byteSizeGo</li>
-<li>Monospace Mentor</li>
-<li>Golang Weekly</li>
-<li>Changelog News</li>
-<li>VK Newsletter</li>
 <li>The Valuable Dev</li>
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
-<li>Ruby Weekly</li>
-<li>Andreas Brandhorst Newsletter (Sci-Fi author)</li>
-<li>VK Newsletter</li>
-<li>Register Spill</li>
-<li>The Pragmatic Engineer</li>
 </ul><br />
 <h2 style='display: inline' id='magazines-i-liked'>Magazines I like(d)</h2><br />
 <br />
 <span>This is a mix of tech I like(d). I may not be a current subscriber, but now and then, I buy an issue. In random order:</span><br />
 <br />
 <ul>
+<li>Linux User</li>
 <li>LWN (online only)</li>
 <li>freeX (not published anymore)</li>
-<<<<<<< HEAD
-<li>Linux User</li>
 <li>Linux Magazine</li>
-=======
-<li>Linux Magazine</li>
-<li>Linux User</li>
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 </ul><br />
 <h1 style='display: inline' id='formal-education'>Formal education</h1><br />
 <br />
diff --git a/gemfeed/atom.xml b/gemfeed/atom.xml
index ea434cad..5a7e5ea2 100644
--- a/gemfeed/atom.xml
+++ b/gemfeed/atom.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-<<<<<<< HEAD
     <updated>2025-11-18T09:38:47+02:00</updated>
-=======
-    <updated>2025-11-06T15:43:19+02:00</updated>
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
     <title>foo.zone feed</title>
     <subtitle>To be in the .zone!</subtitle>
     <link href="https://foo.zone/gemfeed/atom.xml" rel="self" />
@@ -10194,93 +10190,14 @@ Jan 26 17:36:32 f2 apcupsd[2159]: apcupsd shutdown succeeded
 <br />
 <span>So I put this into my <span class='inlinecode'>zsh</span> dotfiles (in some <span class='inlinecode'>editor.zsh.source</span> in my <span class='inlinecode'>~</span> directory):</span><br />
 <br />
-<!-- Generator: GNU source-highlight 3.1.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><b><u><font color="#000000">export</font></u></b> EDITOR=hx
-<b><u><font color="#000000">export</font></u></b> VISUAL=$EDITOR
-<b><u><font color="#000000">export</font></u></b> GIT_EDITOR=$EDITOR
-<b><u><font color="#000000">export</font></u></b> HELIX_CONFIG_DIR=$HOME/.config/helix
-
-editor::helix::random_theme () {
-    <i><font color="silver"># May add more theme search paths based on OS. This one is</font></i>
-    <i><font color="silver"># for Fedora Linux, but there is also MacOS, etc.</font></i>
-    <b><u><font color="#000000">local</font></u></b> -r theme_dir=/usr/share/helix/runtime/themes
-    <b><u><font color="#000000">if</font></u></b> [ ! -d $theme_dir ]; <b><u><font color="#000000">then</font></u></b>
-        echo <font color="#808080">"Helix theme dir $theme_dir doesnt exist"</font>
-        <b><u><font color="#000000">return</font></u></b> <font color="#000000">1</font>
-    <b><u><font color="#000000">fi</font></u></b>
-
-    <b><u><font color="#000000">local</font></u></b> -r config_file=$HELIX_CONFIG_DIR/config.toml
-    <b><u><font color="#000000">local</font></u></b> -r random_theme=<font color="#808080">"$(basename "</font>$(ls $theme_dir \
-        | grep -v random.toml | grep .toml | sort -R \
-        | head -n <font color="#000000">1</font>)<font color="#808080">" | cut -d. -f1)"</font>
-
-    sed <font color="#808080">"/^theme =/ { s/.*/theme = </font>\"<font color="#808080">$random_theme</font>\"<font color="#808080">/; }"</font> \
-        $config_file &gt; $config_file.tmp &amp;&amp; 
-        mv $config_file.tmp $config_file
-}
-
-<b><u><font color="#000000">if</font></u></b> [ -f $HELIX_CONFIG_DIR/config.toml ]; <b><u><font color="#000000">then</font></u></b>
-    editor::helix::random_theme
-<b><u><font color="#000000">fi</font></u></b>
-</pre>
 <br />
 <span>So every time I open a new terminal or shell, <span class='inlinecode'>editor::helix::random_theme</span> gets called, which randomly selects a theme from all installed ones and updates the helix config accordingly.</span><br />
 <br />
-<!-- Generator: GNU source-highlight 3.1.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre>[paul@earth] ~ % editor::helix::random_theme
-[paul@earth] ~ % head -n <font color="#000000">1</font> ~/.config/helix/config.toml
-theme = <font color="#808080">"jellybeans"</font>
-[paul@earth] ~ % editor::helix::random_theme
-[paul@earth] ~ % head -n <font color="#000000">1</font> ~/.config/helix/config.toml
-theme = <font color="#808080">"rose_pine"</font>
-[paul@earth] ~ % editor::helix::random_theme
-[paul@earth] ~ % head -n <font color="#000000">1</font> ~/.config/helix/config.toml
-theme = <font color="#808080">"noctis"</font>
-[paul@earth] ~ %
-</pre>
 <br />
 <h2 style='display: inline' id='a-better-version'>A better version</h2><br />
 <br />
 <span class='quote'>Update 2024-12-18: This is an improved version, which works cross platform (e.g., also on MacOS) and multiple theme directories:</span><br />
 <br />
-<!-- Generator: GNU source-highlight 3.1.9
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><b><u><font color="#000000">export</font></u></b> EDITOR=hx
-<b><u><font color="#000000">export</font></u></b> VISUAL=$EDITOR
-<b><u><font color="#000000">export</font></u></b> GIT_EDITOR=$EDITOR
-<b><u><font color="#000000">export</font></u></b> HELIX_CONFIG_DIR=$HOME/.config/helix
-
-editor::helix::theme::get_random () {
-    <b><u><font color="#000000">for</font></u></b> dir <b><u><font color="#000000">in</font></u></b> $(hx --health \
-        | awk <font color="#808080">'/^Runtime directories/ { print $3 }'</font> | tr <font color="#808080">';'</font> <font color="#808080">' '</font>); <b><u><font color="#000000">do</font></u></b>
-        <b><u><font color="#000000">if</font></u></b> [ -d $dir/themes ]; <b><u><font color="#000000">then</font></u></b>
-            ls $dir/themes
-        <b><u><font color="#000000">fi</font></u></b>
-    <b><u><font color="#000000">done</font></u></b> | grep -F .toml | sort -R | head -n <font color="#000000">1</font> | cut -d. -f<font color="#000000">1</font>
-}
-
-editor::helix::theme::set () {
-    <b><u><font color="#000000">local</font></u></b> -r theme=<font color="#808080">"$1"</font>; <b><u><font color="#000000">shift</font></u></b>
-
-    <b><u><font color="#000000">local</font></u></b> -r config_file=$HELIX_CONFIG_DIR/config.toml
-
-    sed <font color="#808080">"/^theme =/ { s/.*/theme = </font>\"<font color="#808080">$theme</font>\"<font color="#808080">/; }"</font> \
-        $config_file &gt; $config_file.tmp &amp;&amp; 
-        mv $config_file.tmp $config_file
-}
-
-<b><u><font color="#000000">if</font></u></b> [ -f $HELIX_CONFIG_DIR/config.toml ]; <b><u><font color="#000000">then</font></u></b>
-    editor::helix::theme::<b><u><font color="#000000">set</font></u></b> $(editor::helix::theme::get_random)
-<b><u><font color="#000000">fi</font></u></b>
-</pre>
 <br />
 <span>I hope you had some fun. E-Mail your comments to <span class='inlinecode'>paul@nospam.buetow.org</span> :-)</span><br />
 <br />
diff --git a/index.html b/index.html
index c5063d1c..d8feb7b0 100644
--- a/index.html
+++ b/index.html
@@ -13,11 +13,7 @@
 </p>
 <h1 style='display: inline' id='hello'>Hello!</h1><br />
 <br />
-<<<<<<< HEAD
-<span class='quote'>This site was generated at 2025-11-18T09:38:47+02:00 by <span class='inlinecode'>Gemtexter</span></span><br />
-=======
-<span class='quote'>This site was generated at 2025-11-09T12:53:07+02:00 by <span class='inlinecode'>Gemtexter</span></span><br />
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
+<span class='quote'>This site was generated at 2025-11-18T09:41:06+02:00 by <span class='inlinecode'>Gemtexter</span></span><br />
 <br />
 <span>Welcome to the foo.zone!</span><br />
 <br />
diff --git a/uptime-stats.html b/uptime-stats.html
index da559ce0..e24c9654 100644
--- a/uptime-stats.html
+++ b/uptime-stats.html
@@ -13,11 +13,7 @@
 </p>
 <h1 style='display: inline' id='my-machine-uptime-stats'>My machine uptime stats</h1><br />
 <br />
-<<<<<<< HEAD
-<span class='quote'>This site was last updated at 2025-11-18T09:38:47+02:00</span><br />
-=======
-<span class='quote'>This site was last updated at 2025-11-09T12:53:12+02:00</span><br />
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
+<span class='quote'>This site was last updated at 2025-11-18T09:41:05+02:00</span><br />
 <br />
 <span>The following stats were collected via <span class='inlinecode'>uptimed</span> on all of my personal computers over many years and the output was generated by <span class='inlinecode'>guprecords</span>, the global uptime records stats analyser of mine.</span><br />
 <br />
@@ -39,32 +35,24 @@
 | Pos |           Host | Boots |                  Last Kernel |
 +-----+----------------+-------+------------------------------+
 |  1. |  alphacentauri |   671 |      FreeBSD 11.4-RELEASE-p7 |
-<<<<<<< HEAD
 |  2. |         *earth |   212 | Linux 6.17.7-300.fc43.x86_64 |
-=======
-|  2. |         *earth |   211 | Linux 6.17.5-300.fc43.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  3. |           mars |   207 |          Linux 3.2.0-4-amd64 |
 |  4. |       callisto |   153 |  Linux 4.0.4-303.fc22.x86_64 |
 |  5. |       dionysus |   136 |     FreeBSD 13.0-RELEASE-p11 |
 |  6. |      tauceti-e |   120 |          Linux 3.2.0-4-amd64 |
-<<<<<<< HEAD
 |  7. |      *makemake |    81 |  Linux 6.9.9-200.fc40.x86_64 |
-=======
-|  7. |      *makemake |    77 |  Linux 6.9.9-200.fc40.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  8. |            *f2 |    70 |         FreeBSD 14.3-RELEASE |
 |  9. |            *f1 |    65 |         FreeBSD 14.3-RELEASE |
 | 10. |            *f0 |    62 |         FreeBSD 14.3-RELEASE |
 | 11. |         uranus |    59 |                  NetBSD 10.1 |
 | 12. |          pluto |    51 |          Linux 3.2.0-4-amd64 |
-| 13. |   *mega-m3-pro |    50 |                Darwin 24.6.0 |
-| 14. |      mega15289 |    50 |                Darwin 23.4.0 |
+| 13. |      mega15289 |    50 |                Darwin 23.4.0 |
+| 14. |   *mega-m3-pro |    50 |                Darwin 24.6.0 |
 | 15. |    *fishfinger |    46 |                  OpenBSD 7.7 |
 | 16. |           t450 |    44 |         FreeBSD 14.2-RELEASE |
 | 17. |      *blowfish |    43 |                  OpenBSD 7.7 |
-| 18. |       mega8477 |    40 |                Darwin 13.4.0 |
-| 19. |         phobos |    40 |      Linux 3.4.0-CM-g1dd7cdf |
+| 18. |         phobos |    40 |      Linux 3.4.0-CM-g1dd7cdf |
+| 19. |       mega8477 |    40 |                Darwin 13.4.0 |
 | 20. |            sun |    33 |     FreeBSD 10.3-RELEASE-p24 |
 +-----+----------------+-------+------------------------------+
 </pre>
@@ -78,11 +66,7 @@
 | Pos |           Host |                      Uptime |                       Last Kernel |
 +-----+----------------+-----------------------------+-----------------------------------+
 |  1. |         vulcan |   4 years, 5 months, 6 days | Linux 3.10.0-1160.81.1.el7.x86_64 |
-<<<<<<< HEAD
 |  2. |         *earth | 3 years, 10 months, 26 days |      Linux 6.17.7-300.fc43.x86_64 |
-=======
-|  2. |         *earth | 3 years, 10 months, 22 days |      Linux 6.17.5-300.fc43.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  3. |      *blowfish |  3 years, 10 months, 2 days |                       OpenBSD 7.7 |
 |  4. |            sun |  3 years, 9 months, 26 days |          FreeBSD 10.3-RELEASE-p24 |
 |  5. |         uranus |   3 years, 9 months, 5 days |                       NetBSD 10.1 |
@@ -97,11 +81,7 @@
 | 14. |   *mega-m3-pro |  1 years, 5 months, 31 days |                     Darwin 24.6.0 |
 | 15. |       mega8477 |  1 years, 3 months, 25 days |                     Darwin 13.4.0 |
 | 16. |          host0 |   1 years, 3 months, 9 days |          FreeBSD 6.2-RELEASE-p5   |
-<<<<<<< HEAD
 | 17. |      *makemake |   1 years, 3 months, 7 days |       Linux 6.9.9-200.fc40.x86_64 |
-=======
-| 17. |      *makemake |   1 years, 3 months, 6 days |       Linux 6.9.9-200.fc40.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 | 18. |      tauceti-e |  1 years, 2 months, 20 days |               Linux 3.2.0-4-amd64 |
 | 19. |       callisto | 0 years, 10 months, 31 days |       Linux 4.0.4-303.fc22.x86_64 |
 | 20. |  alphacentauri | 0 years, 10 months, 28 days |           FreeBSD 11.4-RELEASE-p7 |
@@ -118,11 +98,7 @@
 +-----+----------------+-------+-----------------------------------+
 |  1. |         uranus |   340 |                       NetBSD 10.1 |
 |  2. |         vulcan |   275 | Linux 3.10.0-1160.81.1.el7.x86_64 |
-<<<<<<< HEAD
 |  3. |         *earth |   268 |      Linux 6.17.7-300.fc43.x86_64 |
-=======
-|  3. |         *earth |   268 |      Linux 6.17.5-300.fc43.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  4. |      *blowfish |   243 |                       OpenBSD 7.7 |
 |  5. |            sun |   238 |          FreeBSD 10.3-RELEASE-p24 |
 |  6. |          uugrn |   211 |           FreeBSD 11.2-RELEASE-p4 |
@@ -134,11 +110,7 @@
 | 12. |      mega15289 |   147 |                     Darwin 23.4.0 |
 | 13. |        tauceti |   141 |               Linux 3.2.0-4-amd64 |
 | 14. |      *makemake |   139 |       Linux 6.9.9-200.fc40.x86_64 |
-<<<<<<< HEAD
 | 15. |           t450 |   119 |              FreeBSD 14.2-RELEASE |
-=======
-| 15. |          *t450 |   122 |              FreeBSD 14.2-RELEASE |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 | 16. |      tauceti-f |   108 |               Linux 3.2.0-3-amd64 |
 | 17. |   *mega-m3-pro |    96 |                     Darwin 24.6.0 |
 | 18. |      tauceti-e |    96 |               Linux 3.2.0-4-amd64 |
@@ -158,11 +130,7 @@
 |  1. |       dionysus |  8 years, 3 months, 16 days |     FreeBSD 13.0-RELEASE-p11 |
 |  2. |         uranus |  6 years, 7 months, 31 days |                  NetBSD 10.1 |
 |  3. |  alphacentauri | 5 years, 11 months, 18 days |      FreeBSD 11.4-RELEASE-p7 |
-<<<<<<< HEAD
 |  4. |      *makemake |  3 years, 8 months, 11 days |  Linux 6.9.9-200.fc40.x86_64 |
-=======
-|  4. |      *makemake |   3 years, 8 months, 4 days |  Linux 6.9.9-200.fc40.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  5. |           moon |   2 years, 1 months, 1 days |      FreeBSD 14.0-RELEASE-p3 |
 |  6. |       callisto |  1 years, 5 months, 15 days |  Linux 4.0.4-303.fc22.x86_64 |
 |  7. |      mega15289 |  1 years, 4 months, 24 days |                Darwin 23.4.0 |
@@ -193,15 +161,9 @@
 |  1. |         uranus |  10 years, 4 months, 5 days |                       NetBSD 10.1 |
 |  2. |       dionysus |  8 years, 6 months, 17 days |          FreeBSD 13.0-RELEASE-p11 |
 |  3. |  alphacentauri |  6 years, 9 months, 13 days |           FreeBSD 11.4-RELEASE-p7 |
-<<<<<<< HEAD
 |  4. |      *makemake | 4 years, 10 months, 16 days |       Linux 6.9.9-200.fc40.x86_64 |
 |  5. |         vulcan |   4 years, 5 months, 6 days | Linux 3.10.0-1160.81.1.el7.x86_64 |
 |  6. |         *earth |  4 years, 4 months, 23 days |      Linux 6.17.7-300.fc43.x86_64 |
-=======
-|  4. |      *makemake |  4 years, 10 months, 8 days |       Linux 6.9.9-200.fc40.x86_64 |
-|  5. |         vulcan |   4 years, 5 months, 6 days | Linux 3.10.0-1160.81.1.el7.x86_64 |
-|  6. |         *earth |  4 years, 4 months, 11 days |      Linux 6.17.5-300.fc43.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  7. |      *blowfish |  3 years, 10 months, 3 days |                       OpenBSD 7.7 |
 |  8. |            sun |  3 years, 10 months, 2 days |          FreeBSD 10.3-RELEASE-p24 |
 |  9. |          uugrn |   3 years, 5 months, 5 days |           FreeBSD 11.2-RELEASE-p4 |
@@ -230,11 +192,7 @@
 |  1. |  FreeBSD 10... |   551 |
 |  2. |     Linux 3... |   550 |
 |  3. | *FreeBSD 14... |   215 |
-<<<<<<< HEAD
 |  4. |    *Linux 6... |   197 |
-=======
-|  4. |    *Linux 6... |   192 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  5. |     Linux 5... |   162 |
 |  6. |     Linux 4... |   161 |
 |  7. |  FreeBSD 11... |   153 |
@@ -266,11 +224,7 @@
 |  2. |  *OpenBSD 7... |   7 years, 6 months, 29 days |
 |  3. |  FreeBSD 10... |    5 years, 9 months, 9 days |
 |  4. |     Linux 5... |  4 years, 10 months, 21 days |
-<<<<<<< HEAD
 |  5. |    *Linux 6... |   3 years, 1 months, 24 days |
-=======
-|  5. |    *Linux 6... |   3 years, 1 months, 19 days |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  6. |     Linux 4... |   2 years, 7 months, 22 days |
 |  7. |  FreeBSD 11... |   2 years, 4 months, 28 days |
 |  8. | *FreeBSD 14... |   2 years, 3 months, 24 days |
@@ -301,11 +255,7 @@
 |  2. |  *OpenBSD 7... |   484 |
 |  3. |  FreeBSD 10... |   406 |
 |  4. |     Linux 5... |   317 |
-<<<<<<< HEAD
 |  5. |    *Linux 6... |   213 |
-=======
-|  5. |    *Linux 6... |   211 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  6. |     Linux 4... |   175 |
 |  7. | *FreeBSD 14... |   161 |
 |  8. |  FreeBSD 11... |   159 |
@@ -332,11 +282,7 @@
 +-----+------------+-------+
 | Pos | KernelName | Boots |
 +-----+------------+-------+
-<<<<<<< HEAD
 |  1. |     *Linux |  1092 |
-=======
-|  1. |     *Linux |  1087 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  2. |   *FreeBSD |  1080 |
 |  3. |    *Darwin |   155 |
 |  4. |   *OpenBSD |   109 |
@@ -352,11 +298,7 @@
 +-----+------------+-----------------------------+
 | Pos | KernelName |                      Uptime |
 +-----+------------+-----------------------------+
-<<<<<<< HEAD
 |  1. |     *Linux | 28 years, 2 months, 16 days |
-=======
-|  1. |     *Linux | 28 years, 2 months, 11 days |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  2. |   *FreeBSD | 12 years, 2 months, 24 days |
 |  3. |   *OpenBSD |   8 years, 2 months, 7 days |
 |  4. |    *Darwin |  5 years, 1 months, 19 days |
-- 
cgit v1.2.3