1 files changed, 79 insertions, 246 deletions
diff --git a/about/resources.md b/about/resources.md
index 4bc3cc1e..26624323 100644
--- a/about/resources.md
+++ b/about/resources.md
@@ -35,211 +35,110 @@ 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;
-* DNS and BIND; Cricket Liu; O'Reilly
-* Learn You a Haskell for Great Good!; Miran Lipovaca; No Starch Press
-* Go Brain Teasers - Exercise Your Mind; Miki Tebeka; The Pragmatic Programmers
-* Effective awk programming; Arnold Robbins; O'Reilly
-* Pro Puppet; James Turnbull, Jeffrey McCune; Apress
-* Clusterbau mit Linux-HA; Michael Schwartzkopff; O'Reilly
-* The Go Programming Language; Alan A. A. Donovan; Addison-Wesley Professional
-* 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
+* Developing Games in Java; David Brackeen and others...; New Riders
+* The Docker Book; James Turnbull; Kindle
 * Ultimate Go Notebook; Bill Kennedy
-* Hands-on Infrastructure Monitoring with Prometheus; Joel Bastos, Pedro Araujo; Packt 
-* The KCNA (Kubernetes and Cloud Native Associate) Book; Nigel Poulton
-* Systems Performance Tuning; Gian-Paolo D. Musumeci and others...; O'Reilly
-* Concurrency in Go; Katherine Cox-Buday; O'Reilly
+* Raku Fundamentals; Moritz Lenz; Apress
 * Modern Perl; Chromatic ; Onyx Neon Press
 * Kubernetes Cookbook; Sameer Naik, Sébastien Goasguen, Jonathan Michaux; O'Reilly
-* The Pragmatic Programmer; David Thomas; Addison-Wesley
-* Learn You Some Erlang for Great Good; Fred Herbert; No Starch Press
-* Programming Ruby 3.3 (5th Edition); Noel Rappin, with Dave Thomas; The Pragmatic Bookshelf
-* 21st Century C: C Tips from the New School; Ben Klemens; O'Reilly
-* Developing Games in Java; David Brackeen and others...; New Riders
-* The DevOps Handbook; Gene Kim, Jez Humble, Patrick Debois, John Willis; Audible
-* Terraform Cookbook; Mikael Krief; Packt Publishing
+* Effective Java; Joshua Bloch; Addison-Wesley Professional
+* Site Reliability Engineering; How Google runs production systems; O'Reilly
+* Funktionale Programmierung; Peter Pepper; Springer
+* Object-Oriented Programming with ANSI-C; Axel-Tobias Schreiner
+* The Go Programming Language; Alan A. A. Donovan; Addison-Wesley Professional
 * Java ist auch eine Insel; Christian Ullenboom; 
-* Perl New Features; Joshua McAdams, brian d foy; Perl School
-* The Docker Book; James Turnbull; Kindle
-* Higher Order Perl; Mark Dominus; Morgan Kaufmann
+* Systems Performance Tuning; Gian-Paolo D. Musumeci and others...; O'Reilly
+* Pro Puppet; James Turnbull, Jeffrey McCune; Apress
 * The Kubernetes Book; Nigel Poulton; Unabridged Audiobook
-* Think Raku (aka Think Perl 6); Laurent Rosenfeld, Allen B. Downey; O'Reilly
+* Seeking SRE: Conversations About Running Production Systems at Scale; David N. Blank-Edelman; eBook
 * Tmux 2: Productive Mouse-free Development; Brain P. Hogan; The Pragmatic Programmers 
-* DevOps And Site Reliability Engineering Handbook; Stephen Fleming; Audible
+* 97 things every SRE should know; Emil Stolarsky, Jaime Woo; O'Reilly
+* Polished Ruby Programming; Jeremy Evans; Packt Publishing
+* Clusterbau mit Linux-HA; Michael Schwartzkopff; O'Reilly
+* Leanring eBPF; Liz Rice; O'Reilly
 * Data Science at the Command Line; Jeroen Janssens; O'Reilly
-* Raku Fundamentals; Moritz Lenz; Apress
-* Effective Java; Joshua Bloch; Addison-Wesley Professional
+* The Pragmatic Programmer; David Thomas; Addison-Wesley
 * 100 Go Mistakes and How to Avoid Them; Teiva Harsanyi; Manning Publications
-* Leanring eBPF; Liz Rice; O'Reilly
-* 97 things every SRE should know; Emil Stolarsky, Jaime Woo; O'Reilly
-* Programming Perl aka "The Camel Book"; Tom Christiansen, brian d foy, Larry Wall & Jon Orwant; O'Reilly
-* Raku Recipes; J.J. Merelo; Apress
-* Amazon Web Services in Action; Michael Wittig and Andreas Wittig; Manning Publications
-* Object-Oriented Programming with ANSI-C; Axel-Tobias Schreiner
+* DevOps And Site Reliability Engineering Handbook; Stephen Fleming; Audible
+* The DevOps Handbook; Gene Kim, Jez Humble, Patrick Debois, John Willis; Audible
+* Learn You Some Erlang for Great Good; Fred Herbert; No Starch Press
+* 21st Century C: C Tips from the New School; Ben Klemens; O'Reilly
+* Think Raku (aka Think Perl 6); Laurent Rosenfeld, Allen B. Downey; O'Reilly
+* Concurrency in Go; Katherine Cox-Buday; O'Reilly
+* Terraform Cookbook; Mikael Krief; Packt Publishing
 * Distributed Systems: Principles and Paradigms; Andrew S. Tanenbaum; Pearson
-* Polished Ruby Programming; Jeremy Evans; Packt Publishing
-* 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
+* Programming Ruby 3.3 (5th Edition); Noel Rappin, with Dave Thomas; The Pragmatic Bookshelf
+* Go Brain Teasers - Exercise Your Mind; Miki Tebeka; The Pragmatic Programmers
+* Chaos Engineering - System Resiliency in Practice; Casey Rosenthal and Nora Jones; eBook
 * 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
+* Systemprogrammierung in Go; Frank Müller; dpunkt
 * 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
+* 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
+* Programming Perl aka "The Camel Book"; Tom Christiansen, brian d foy, Larry Wall & Jon Orwant; O'Reilly
+* Amazon Web Services in Action; Michael Wittig and Andreas Wittig; Manning Publications
 * Learn You a Haskell for Great Good!; Miran Lipovaca; No Starch Press
-* The Pragmatic Programmer; David Thomas; Addison-Wesley
+* Raku Recipes; J.J. Merelo; Apress
 * 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
-* Understanding the Linux Kernel; Daniel P. Bovet, Marco Cesati; O'Reilly
-* Go: Design Patterns for Real-World Projects; Mat Ryer; Packt
-* 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
+* Groovy Kurz & Gut; Joerg Staudemeier; O'Reilly
 * 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 
+* Go: Design Patterns for Real-World Projects; Mat Ryer; Packt
 * 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
+* Ultralearning; Anna Laurent; Self-published via Amazon
+* Who Moved My Cheese?; Dr. Spencer Johnson; Vermilion
 * The Bullet Journal Method; Ryder Carroll; Fourth Estate
-* The Off Switch; Mark Cropley; Virgin Books (RE-READ 1ST TIME)
-* So Good They Can't Ignore You; Cal Newport; Business Plus
-* Deep Work; Cal Newport; Piatkus
+* The Joy of Missing Out; Christina Crook; New Society Publishers
+* Coders at Work - Reflections on the craft of programming, Peter Seibel and Mitchell Dorian et al., Audiobook
+* The Complete Software Developer's Career Guide; John Sonmez; Unabridged Audiobook
+* Stop starting, start finishing; Arne Roock; Lean-Kanban University  
+* Slow Productivity; Cal Newport; Penguin Random House
 * Ultralearning; Scott Young; Thorsons
-* The Phoenix Project - A Novel About IT, DevOps, and Helping your Business Win; Gene Kim and Kevin Behr; Trade Select
-* Staff Engineer: Leadership beyond the management track; Will Larson; Audiobook
 * Never Split the Difference; Chris Voss, Tahl Raz; Random House Business
-* Stop starting, start finishing; Arne Roock; Lean-Kanban University  
-* Eat That Frog; Brian Tracy
-* The Good Enough Job; Simone Stolzoff; Ebury Edge
-* Consciousness: A Very Short Introduction; Susan Blackmore; Oxford Uiversity Press
-* The Complete Software Developer's Career Guide; John Sonmez; Unabridged Audiobook
-* Digital Minimalism; Cal Newport; Portofolio Penguin
+* Meditation for Mortals, Oliver Burkeman, Audiobook
+* Time Management for System Administrators; Thomas A. Limoncelli; O'Reilly
+* Staff Engineer: Leadership beyond the management track; Will Larson; Audiobook
+* The 7 Habits Of Highly Effective People; Stephen R. Covey; Simon & Schuster UK
 * The Daily Stoic; Ryan Holiday, Stephen Hanselman; Profile Books
+* 101 Essays that change the way you think; Brianna Wiest; Audiobook
 * The Power of Now; Eckhard Tolle; Yellow Kite
+* The Software Engineer's Guidebook: Navigating senior, tech lead, and staff engineer positions at tech companies and startups; Gergely Orosz; Audiobook 
+* Psycho-Cybernetics; Maxwell Maltz; Perigee Books
+* The Good Enough Job; Simone Stolzoff; Ebury Edge
+* Digital Minimalism; Cal Newport; Portofolio Penguin
+* The Courage to Be Disliked; Ichiro Kishimi and Fumitake Koga; Audiobook
+* Deep Work; Cal Newport; Piatkus
 * Influence without Authority; A. Cohen, D. Bradford; Wiley
-* Meditation for Mortals, Oliver Burkeman, Audiobook
+* The Off Switch; Mark Cropley; Virgin Books (RE-READ 1ST TIME)
+* Eat That Frog; Brian Tracy
 * Getting Things Done; David Allen
 * Eat That Frog!; Brian Tracy; Hodder Paperbacks
-* Buddah and Einstein walk into a Bar; Guy Joseph Ale, Claire Bloom; Blackstone Publishing
-* Slow Productivity; Cal Newport; Penguin Random House
 * The Obstacle Is The Way; Ryan Holiday; Profile Books Ltd
-* Soft Skills; John Sommez; Manning Publications
-* The Joy of Missing Out; Christina Crook; New Society Publishers
-* 97 Things Every Engineering Manager Should Know; Camille Fournier; Audiobook
-* The Courage to Be Disliked; Ichiro Kishimi and Fumitake Koga; Audiobook
-* 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
-* 101 Essays that change the way you think; Brianna Wiest; Audiobook
-* Who Moved My Cheese?; Dr. Spencer Johnson; Vermilion
-* Solve for Happy; Mo Gawdat (RE-READ 1ST TIME)
-* 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
+* Consciousness: A Very Short Introduction; Susan Blackmore; Oxford Uiversity Press
+* Buddah and Einstein walk into a Bar; Guy Joseph Ale, Claire Bloom; Blackstone Publishing
 * 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
+* The Phoenix Project - A Novel About IT, DevOps, and Helping your Business Win; Gene Kim and Kevin Behr; Trade Select
 * 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
+* Soft Skills; John Sommez; Manning Publications
 * 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)  
 
@@ -247,48 +146,29 @@ In random order:
 
 Some of these were in-person with exams; others were online learning lectures only. In random order:
 
-<<<<<<< HEAD
+* Algorithms Video Lectures; Robert Sedgewick; O'Reilly Online
 * Ultimate Go Programming; Bill Kennedy; O'Reilly Online
-* Apache Tomcat Best Practises; 3-day on-site training
-* Protocol buffers; O'Reilly Online
+* Scripting Vim; Damian Conway; O'Reilly Online
 * Developing IaC with Terraform (with Live Lessons); O'Reilly Online
-* AWS Immersion Day; Amazon; 1-day interactive online training 
+* F5 Loadbalancers Training; 2-day on-site training; F5, Inc. 
 * The Well-Grounded Rubyist Video Edition; David. A. Black; O'Reilly Online
-* Algorithms Video Lectures; Robert Sedgewick; O'Reilly Online
+* Cloud Operations on AWS - Learn how to configure, deploy, maintain, and troubleshoot your AWS environments; 3-day online live training with labs; Amazon
+* Protocol buffers; O'Reilly Online
+* Apache Tomcat Best Practises; 3-day on-site training
 * Linux Security and Isolation APIs Training; Michael Kerrisk; 3-day on-site training
-* The Ultimate Kubernetes Bootcamp; School of Devops; O'Reilly Online
-* F5 Loadbalancers Training; 2-day on-site training; F5, Inc. 
-* 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)
 * MySQL Deep Dive Workshop; 2-day on-site training
-* Structure and Interpretation of Computer Programs; Harold Abelson and more...; 
-* 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
+* AWS Immersion Day; Amazon; 1-day interactive online training 
 * 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
 
 These are not whole books, but guides (smaller or larger) which I found very useful. in random order:
 
-* Advanced Bash-Scripting Guide 
 * How CPUs work at https://cpu.land
+* Advanced Bash-Scripting Guide 
 * Raku Guide at https://raku.guide  
 
 ## Podcasts
@@ -297,105 +177,58 @@ These are not whole books, but guides (smaller or larger) which I found very use
 
 In random order:
 
-<<<<<<< HEAD
+* Fork Around And Find Out
+* Fallthrough [Golang]
 * Dev Interrupted
-* Maintainable
 * The Pragmatic Engineer Podcast
-* The ProdCast (Google SRE Podcast)
-* BSD Now [BSD]
 * Modern Mentor
+* Maintainable
 * Backend Banter
-* Fallthrough [Golang]
 * Wednesday Wisdom
-* Deep Questions with Cal Newport
+* The ProdCast (Google SRE Podcast)
+* BSD Now [BSD]
 * Cup o' Go [Golang]
-* Hidden Brain
 * 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
+* Deep Questions with Cal Newport
 
 ### 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
-=======
+* Java Pub House
 * 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
+* Monospace Mentor
 * 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
+* Golang Weekly
 * The Valuable Dev
-* Ruby Weekly
-* byteSizeGo
 * Changelog News
+* Applied Go Weekly Newsletter
 * The Pragmatic Engineer
-* The Valuable Dev
+* The Imperfectionist
+* Ruby Weekly
+* Register Spill
 
 ## Magazines I like(d)
 
 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
+* LWN (online only)
 * Linux User
->>>>>>> 0d5b0f03017acf7b5099cc10d6dd7f6b9af72428
 
 # Formal education