fix

4 files changed, 241 insertions, 4 deletions

diff --git a/about/index.md b/about/index.md
index d41c5777..86212d24 100644
--- a/about/index.md
+++ b/about/index.md
@@ -31,7 +31,11 @@
 
 ### Books I am currently reading / listening (4)
 
+<<<<<<< HEAD
 * 97 Things Every Cloud Engineer Should Know: Collective Wisdom from the Experts; Emily Freeman, Nathen Harvey; eBook (ePub)
+=======
+* Seeking SRE: Conversations About Running Production Systems at Scale; David N. Blank-Edelman; eBook (Kobo kePub)
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 * How to talk so kids will listen & Listen so kids will talk; Audiobook (Audible)
 * 2005 - Okular; Alastair Reynolds; eBook (Kobo kePub)
 * 2021 - Inhibitor Phase; Alastair Reynolds; Audiobook (Libro.fm)
@@ -40,8 +44,12 @@
 
 * Clean Code; Audiobook (Audible)
 * Bash it out
+<<<<<<< HEAD
 * Positiv Wirkt: Wie du mit positivem Denken und Handeln aktiv dein Leben gestaltest (german); Armin Schubert; Paperback
 * The Courage To Be Happy; Ichiro Kishimi and Fumitake Koga; Paperback
+=======
+* 97 Things Every Cloud Engineer Should Know: Collective Wisdom from the Experts; Emily Freeman, Nathen Harvey; eBook (ePub)
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 * 1992 - A Fire Upon the Deep (german: Ein Feuer auf der Tiefe); Vernor Vinge; eBook (buecher.de)
 * 2025 - Origin: Die Entdecknug (german); Andreas Brandhorst; eBook (buecher.de)
 * 2025 - Origin: Die Erweckung (german); Joschua Tree; eBook (buecher.de)
diff --git a/about/resources.md b/about/resources.md
index e311c7ae..4bc3cc1e 100644
--- a/about/resources.md
+++ b/about/resources.md
@@ -35,6 +35,7 @@ You won't find any links on this site because, over time, the links will break.
 
 In random order:
 
+<<<<<<< HEAD
 * Site Reliability Engineering; How Google runs production systems; O'Reilly
 * Funktionale Programmierung; Peter Pepper; Springer
 * C++ Programming Language; Bjarne Stroustrup;
@@ -83,11 +84,61 @@ In random order:
 * Seeking SRE: Conversations About Running Production Systems at Scale; David N. Blank-Edelman; eBook
 * Chaos Engineering - System Resiliency in Practice; Casey Rosenthal and Nora Jones; eBook
 * Systemprogrammierung in Go; Frank Müller; dpunkt
+=======
+* Higher Order Perl; Mark Dominus; Morgan Kaufmann
+* The DevOps Handbook; Gene Kim, Jez Humble, Patrick Debois, John Willis; Audible
+* Polished Ruby Programming; Jeremy Evans; Packt Publishing
+* Developing Games in Java; David Brackeen and others...; New Riders
+* C++ Programming Language; Bjarne Stroustrup;
+* Clusterbau mit Linux-HA; Michael Schwartzkopff; O'Reilly
+* Effective Java; Joshua Bloch; Addison-Wesley Professional
+* Java ist auch eine Insel; Christian Ullenboom; 
+* 97 things every SRE should know; Emil Stolarsky, Jaime Woo; O'Reilly
+* Effective awk programming; Arnold Robbins; O'Reilly
+* The Go Programming Language; Alan A. A. Donovan; Addison-Wesley Professional
+* Programming Perl aka "The Camel Book"; Tom Christiansen, brian d foy, Larry Wall & Jon Orwant; O'Reilly
+* Distributed Systems: Principles and Paradigms; Andrew S. Tanenbaum; Pearson
+* The Docker Book; James Turnbull; Kindle
+* The KCNA (Kubernetes and Cloud Native Associate) Book; Nigel Poulton
+* Systemprogrammierung in Go; Frank Müller; dpunkt
+* Think Raku (aka Think Perl 6); Laurent Rosenfeld, Allen B. Downey; O'Reilly
+* Funktionale Programmierung; Peter Pepper; Springer
+* Kubernetes Cookbook; Sameer Naik, Sébastien Goasguen, Jonathan Michaux; O'Reilly
+* 100 Go Mistakes and How to Avoid Them; Teiva Harsanyi; Manning Publications
+* Amazon Web Services in Action; Michael Wittig and Andreas Wittig; Manning Publications
+* Raku Fundamentals; Moritz Lenz; Apress
+* Tmux 2: Productive Mouse-free Development; Brain P. Hogan; The Pragmatic Programmers 
+* Raku Recipes; J.J. Merelo; Apress
+* The Kubernetes Book; Nigel Poulton; Unabridged Audiobook
+* Perl New Features; Joshua McAdams, brian d foy; Perl School
+* Modern Perl; Chromatic ; Onyx Neon Press
+* Terraform Cookbook; Mikael Krief; Packt Publishing
+* Go Brain Teasers - Exercise Your Mind; Miki Tebeka; The Pragmatic Programmers
+* Programming Ruby 3.3 (5th Edition); Noel Rappin, with Dave Thomas; The Pragmatic Bookshelf
+* Leanring eBPF; Liz Rice; O'Reilly
+* Pro Puppet; James Turnbull, Jeffrey McCune; Apress
+* DNS and BIND; Cricket Liu; O'Reilly
+* Object-Oriented Programming with ANSI-C; Axel-Tobias Schreiner
+* Ultimate Go Notebook; Bill Kennedy
+* Site Reliability Engineering; How Google runs production systems; O'Reilly
+* Learn You a Haskell for Great Good!; Miran Lipovaca; No Starch Press
+* The Pragmatic Programmer; David Thomas; Addison-Wesley
+* Hands-on Infrastructure Monitoring with Prometheus; Joel Bastos, Pedro Araujo; Packt 
+* Systems Performance Tuning; Gian-Paolo D. Musumeci and others...; O'Reilly
+* Chaos Engineering - System Resiliency in Practice; Casey Rosenthal and Nora Jones; eBook
+* Learn You Some Erlang for Great Good; Fred Herbert; No Starch Press
+* Data Science at the Command Line; Jeroen Janssens; O'Reilly
+* Concurrency in Go; Katherine Cox-Buday; O'Reilly
+* 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
+* 21st Century C: C Tips from the New School; Ben Klemens; O'Reilly
+* DevOps And Site Reliability Engineering Handbook; Stephen Fleming; Audible
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 
 ## Technical references
 
 I didn't read them from the beginning to the end, but I am using them to look up things. The books are in random order:
 
+<<<<<<< HEAD
 * Algorithms; Robert Sedgewick, Kevin Wayne; Addison Wesley
 * Groovy Kurz & Gut; Joerg Staudemeier; O'Reilly
 * BPF Performance Tools - Linux System and Application Observability, Brendan Gregg; Addison Wesley
@@ -96,12 +147,23 @@ I didn't read them from the beginning to the end, but I am using them to look up
 * Relayd and Httpd Mastery; Michael W Lucas
 * Implementing Service Level Objectives; Alex Hidalgo; O'Reilly
 * The Linux Programming Interface; Michael Kerrisk; No Starch Press 
+=======
+* Groovy Kurz & Gut; Joerg Staudemeier; O'Reilly
+* Go: Design Patterns for Real-World Projects; Mat Ryer; Packt
+* Implementing Service Level Objectives; Alex Hidalgo; O'Reilly
+* Algorithms; Robert Sedgewick, Kevin Wayne; Addison Wesley
+* Understanding the Linux Kernel; Daniel P. Bovet, Marco Cesati; O'Reilly
+* BPF Performance Tools - Linux System and Application Observability, Brendan Gregg; Addison Wesley
+* The Linux Programming Interface; Michael Kerrisk; No Starch Press 
+* Relayd and Httpd Mastery; Michael W Lucas
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 
 ## Self-development and soft-skills books
 
 In random order:
 
 * The Software Engineer's Guidebook: Navigating senior, tech lead, and staff engineer positions at tech companies and startups; Gergely Orosz; Audiobook 
+<<<<<<< HEAD
 * Time Management for System Administrators; Thomas A. Limoncelli; O'Reilly
 * The 7 Habits Of Highly Effective People; Stephen R. Covey; Simon & Schuster UK
 * The Bullet Journal Method; Ryder Carroll; Fourth Estate
@@ -139,6 +201,45 @@ In random order:
 * Psycho-Cybernetics; Maxwell Maltz; Perigee Books
 * Ultralearning; Anna Laurent; Self-published via Amazon
 * Atomic Habits; James Clear; Random House Business
+=======
+* Digital Minimalism; Cal Newport; Portofolio Penguin
+* The Obstacle Is The Way; Ryan Holiday; Profile Books Ltd
+* Slow Productivity; Cal Newport; Penguin Random House
+* So Good They Can't Ignore You; Cal Newport; Business Plus
+* Soft Skills; John Sommez; Manning Publications
+* Time Management for System Administrators; Thomas A. Limoncelli; O'Reilly
+* The Good Enough Job; Simone Stolzoff; Ebury Edge
+* The Joy of Missing Out; Christina Crook; New Society Publishers
+* The Daily Stoic; Ryan Holiday, Stephen Hanselman; Profile Books
+* Ultralearning; Scott Young; Thorsons
+* Eat That Frog!; Brian Tracy; Hodder Paperbacks
+* The Power of Now; Eckhard Tolle; Yellow Kite
+* Coders at Work - Reflections on the craft of programming, Peter Seibel and Mitchell Dorian et al., Audiobook
+* Search Inside Yourself - The Unexpected path to Achieving Success, Happiness (and World Peace); Chade-Meng Tan, Daniel Goleman, Jon Kabat-Zinn; HarperOne
+* The 7 Habits Of Highly Effective People; Stephen R. Covey; Simon & Schuster UK
+* 97 Things Every Engineering Manager Should Know; Camille Fournier; Audiobook
+* Buddah and Einstein walk into a Bar; Guy Joseph Ale, Claire Bloom; Blackstone Publishing
+* The Off Switch; Mark Cropley; Virgin Books (RE-READ 1ST TIME)
+* Consciousness: A Very Short Introduction; Susan Blackmore; Oxford Uiversity Press
+* Eat That Frog; Brian Tracy
+* Never Split the Difference; Chris Voss, Tahl Raz; Random House Business
+* Stop starting, start finishing; Arne Roock; Lean-Kanban University  
+* Staff Engineer: Leadership beyond the management track; Will Larson; Audiobook
+* Who Moved My Cheese?; Dr. Spencer Johnson; Vermilion
+* Influence without Authority; A. Cohen, D. Bradford; Wiley
+* Deep Work; Cal Newport; Piatkus
+* Atomic Habits; James Clear; Random House Business
+* Ultralearning; Anna Laurent; Self-published via Amazon
+* Meditation for Mortals, Oliver Burkeman, Audiobook
+* Solve for Happy; Mo Gawdat (RE-READ 1ST TIME)
+* The Phoenix Project - A Novel About IT, DevOps, and Helping your Business Win; Gene Kim and Kevin Behr; Trade Select
+* Psycho-Cybernetics; Maxwell Maltz; Perigee Books
+* 101 Essays that change the way you think; Brianna Wiest; Audiobook
+* The Courage to Be Disliked; Ichiro Kishimi and Fumitake Koga; Audiobook
+* The Bullet Journal Method; Ryder Carroll; Fourth Estate
+* The Complete Software Developer's Career Guide; John Sonmez; Unabridged Audiobook
+* Getting Things Done; David Allen
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 
 [Here are notes of mine for some of the books](../notes/index.md)  
 
@@ -146,6 +247,7 @@ In random order:
 
 Some of these were in-person with exams; others were online learning lectures only. In random order:
 
+<<<<<<< HEAD
 * Ultimate Go Programming; Bill Kennedy; O'Reilly Online
 * Apache Tomcat Best Practises; 3-day on-site training
 * Protocol buffers; O'Reilly Online
@@ -162,6 +264,24 @@ Some of these were in-person with exams; others were online learning lectures on
 * Cloud Operations on AWS - Learn how to configure, deploy, maintain, and troubleshoot your AWS environments; 3-day online live training with labs; Amazon
 * Functional programming lecture; Remote University of Hagen
 * Scripting Vim; Damian Conway; O'Reilly Online
+=======
+* 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)
+* Cloud Operations on AWS - Learn how to configure, deploy, maintain, and troubleshoot your AWS environments; 3-day online live training with labs; Amazon
+* Scripting Vim; Damian Conway; O'Reilly Online
+* F5 Loadbalancers Training; 2-day on-site training; F5, Inc. 
+* AWS Immersion Day; Amazon; 1-day interactive online training 
+* Ultimate Go Programming; Bill Kennedy; O'Reilly Online
+* Apache Tomcat Best Practises; 3-day on-site training
+* Structure and Interpretation of Computer Programs; Harold Abelson and more...; 
+* Algorithms Video Lectures; Robert Sedgewick; O'Reilly Online
+* The Ultimate Kubernetes Bootcamp; School of Devops; O'Reilly Online
+* Protocol buffers; O'Reilly Online
+* Functional programming lecture; Remote University of Hagen
+* The Well-Grounded Rubyist Video Edition; David. A. Black; O'Reilly Online
+* Developing IaC with Terraform (with Live Lessons); O'Reilly Online
+* Linux Security and Isolation APIs Training; Michael Kerrisk; 3-day on-site training
+* MySQL Deep Dive Workshop; 2-day on-site training
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 
 ## Technical guides
 
@@ -177,6 +297,7 @@ These are not whole books, but guides (smaller or larger) which I found very use
 
 In random order:
 
+<<<<<<< HEAD
 * Dev Interrupted
 * Maintainable
 * The Pragmatic Engineer Podcast
@@ -192,29 +313,68 @@ In random order:
 * Pratical AI
 * Fork Around And Find Out
 * The Changelog Podcast(s)
+=======
+* Cup o' Go [Golang]
+* The Pragmatic Engineer Podcast
+* Wednesday Wisdom
+* Backend Banter
+* Fallthrough [Golang]
+* Deep Questions with Cal Newport
+* Maintainable
+* The ProdCast (Google SRE Podcast)
+* Dev Interrupted
+* Hidden Brain
+* The Changelog Podcast(s)
+* BSD Now [BSD]
+* Fork Around And Find Out
+* Modern Mentor
+* Pratical AI
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 
 ### Podcasts I liked
 
 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.
 
+<<<<<<< HEAD
 * Go Time (predecessor of fallthrough)
 * Ship It (predecessor of Fork Around And Find Out)
 * Modern Mentor
 * Java Pub House
 * CRE: Chaosradio Express [german]
 * FLOSS weekly
+=======
+* Modern Mentor
+* Go Time (predecessor of fallthrough)
+* Java Pub House
+* FLOSS weekly
+* CRE: Chaosradio Express [german]
+* Ship It (predecessor of Fork Around And Find Out)
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 
 ## Newsletters I like
 
 This is a mix of tech and non-tech newsletters I am subscribed to. In random order:
 
+<<<<<<< HEAD
 * Register Spill
 * VK Newsletter
 * Applied Go Weekly Newsletter
 * The Imperfectionist
 * Andreas Brandhorst Newsletter (Sci-Fi author)
 * Golang Weekly
+=======
+* The Imperfectionist
+* Andreas Brandhorst Newsletter (Sci-Fi author)
+* Applied Go Weekly Newsletter
+* Register Spill
+* The Pragmatic Engineer
+* byteSizeGo
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 * Monospace Mentor
+* Golang Weekly
+* Changelog News
+* VK Newsletter
+* The Valuable Dev
 * Ruby Weekly
 * byteSizeGo
 * Changelog News
@@ -225,10 +385,17 @@ This is a mix of tech and non-tech newsletters I am subscribed to. In random ord
 
 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:
 
+<<<<<<< HEAD
 * Linux User
 * LWN (online only)
 * freeX (not published anymore)
 * Linux Magazine
+=======
+* LWN (online only)
+* freeX (not published anymore)
+* Linux Magazine
+* Linux User
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 
 # Formal education
 
diff --git a/index.md b/index.md
index 69155c64..50e39e0b 100644
--- a/index.md
+++ b/index.md
@@ -1,6 +1,10 @@
 # Hello!
 
+<<<<<<< HEAD
 > This site was generated at 2025-11-18T09:41:06+02:00 by `Gemtexter`
+=======
+> This site was generated at 2025-11-09T12:53:07+02:00 by `Gemtexter`
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 
 Welcome to the foo.zone!
 
diff --git a/uptime-stats.md b/uptime-stats.md
index c2470b8a..372af070 100644
--- a/uptime-stats.md
+++ b/uptime-stats.md
@@ -1,6 +1,10 @@
 # My machine uptime stats
 
+<<<<<<< HEAD
 > This site was last updated at 2025-11-18T09:41:05+02:00
+=======
+> This site was last updated at 2025-11-09T12:53:12+02:00
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 
 The following stats were collected via `uptimed` on all of my personal computers over many years and the output was generated by `guprecords`, the global uptime records stats analyser of mine.
 
@@ -22,24 +26,32 @@ Boots is the total number of host boots over the entire lifespan.
 | 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 |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 |  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 |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 |  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. |      mega15289 |    50 |                Darwin 23.4.0 |
-| 14. |   *mega-m3-pro |    50 |                Darwin 24.6.0 |
+| 13. |   *mega-m3-pro |    50 |                Darwin 24.6.0 |
+| 14. |      mega15289 |    50 |                Darwin 23.4.0 |
 | 15. |    *fishfinger |    46 |                  OpenBSD 7.7 |
 | 16. |           t450 |    44 |         FreeBSD 14.2-RELEASE |
 | 17. |      *blowfish |    43 |                  OpenBSD 7.7 |
-| 18. |         phobos |    40 |      Linux 3.4.0-CM-g1dd7cdf |
-| 19. |       mega8477 |    40 |                Darwin 13.4.0 |
+| 18. |       mega8477 |    40 |                Darwin 13.4.0 |
+| 19. |         phobos |    40 |      Linux 3.4.0-CM-g1dd7cdf |
 | 20. |            sun |    33 |     FreeBSD 10.3-RELEASE-p24 |
 +-----+----------------+-------+------------------------------+
 ```
@@ -53,7 +65,11 @@ Uptime is the total uptime of a host over the entire lifespan.
 | 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 |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 |  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 |
@@ -68,7 +84,11 @@ Uptime is the total uptime of a host over the entire lifespan.
 | 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 |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 | 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 |
@@ -85,7 +105,11 @@ Score is calculated by combining all other metrics.
 +-----+----------------+-------+-----------------------------------+
 |  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 |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 |  4. |      *blowfish |   243 |                       OpenBSD 7.7 |
 |  5. |            sun |   238 |          FreeBSD 10.3-RELEASE-p24 |
 |  6. |          uugrn |   211 |           FreeBSD 11.2-RELEASE-p4 |
@@ -97,7 +121,11 @@ Score is calculated by combining all other metrics.
 | 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 |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 | 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 |
@@ -117,7 +145,11 @@ Downtime is the total downtime of a host over the entire lifespan.
 |  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 |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 |  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 |
@@ -148,9 +180,15 @@ Lifespan is the total uptime + the total downtime of a host.
 |  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 |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 |  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 |
@@ -179,7 +217,11 @@ Boots is the total number of host boots over the entire lifespan.
 |  1. |  FreeBSD 10... |   551 |
 |  2. |     Linux 3... |   550 |
 |  3. | *FreeBSD 14... |   215 |
+<<<<<<< HEAD
 |  4. |    *Linux 6... |   197 |
+=======
+|  4. |    *Linux 6... |   192 |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 |  5. |     Linux 5... |   162 |
 |  6. |     Linux 4... |   161 |
 |  7. |  FreeBSD 11... |   153 |
@@ -211,7 +253,11 @@ Uptime is the total uptime of a host over the entire lifespan.
 |  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 |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 |  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 |
@@ -242,7 +288,11 @@ Score is calculated by combining all other metrics.
 |  2. |  *OpenBSD 7... |   484 |
 |  3. |  FreeBSD 10... |   406 |
 |  4. |     Linux 5... |   317 |
+<<<<<<< HEAD
 |  5. |    *Linux 6... |   213 |
+=======
+|  5. |    *Linux 6... |   211 |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 |  6. |     Linux 4... |   175 |
 |  7. | *FreeBSD 14... |   161 |
 |  8. |  FreeBSD 11... |   159 |
@@ -269,7 +319,11 @@ Boots is the total number of host boots over the entire lifespan.
 +-----+------------+-------+
 | Pos | KernelName | Boots |
 +-----+------------+-------+
+<<<<<<< HEAD
 |  1. |     *Linux |  1092 |
+=======
+|  1. |     *Linux |  1087 |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 |  2. |   *FreeBSD |  1080 |
 |  3. |    *Darwin |   155 |
 |  4. |   *OpenBSD |   109 |
@@ -285,7 +339,11 @@ Uptime is the total uptime of a host over the entire lifespan.
 +-----+------------+-----------------------------+
 | Pos | KernelName |                      Uptime |
 +-----+------------+-----------------------------+
+<<<<<<< HEAD
 |  1. |     *Linux | 28 years, 2 months, 16 days |
+=======
+|  1. |     *Linux | 28 years, 2 months, 11 days |
+>>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 |  2. |   *FreeBSD | 12 years, 2 months, 24 days |
 |  3. |   *OpenBSD |   8 years, 2 months, 7 days |
 |  4. |    *Darwin |  5 years, 1 months, 19 days |