1 files changed, 67 insertions, 218 deletions
diff --git a/about/resources.md b/about/resources.md
index 1ce58a7c..a3be49c4 100644
--- a/about/resources.md
+++ b/about/resources.md
@@ -35,195 +35,101 @@ You won't find any links on this site because, over time, the links will break.
 
 In random order:
 
-<<<<<<< HEAD
+* The KCNA (Kubernetes and Cloud Native Associate) Book; Nigel Poulton
+* C++ Programming Language; Bjarne Stroustrup;
+* Learn You a Haskell for Great Good!; Miran Lipovaca; No Starch Press
+* 21st Century C: C Tips from the New School; Ben Klemens; O'Reilly
+* Leanring eBPF; Liz Rice; O'Reilly
 * 100 Go Mistakes and How to Avoid Them; Teiva Harsanyi; Manning Publications
-* The Docker Book; James Turnbull; Kindle
-* Systemprogrammierung in Go; Frank Müller; dpunkt
-* The Kubernetes Book; Nigel Poulton; Unabridged Audiobook
-* Developing Games in Java; David Brackeen and others...; New Riders
-* Perl New Features; Joshua McAdams, brian d foy; Perl School
-* Object-Oriented Programming with ANSI-C; Axel-Tobias Schreiner
-* DNS and BIND; Cricket Liu; O'Reilly
-* Distributed Systems: Principles and Paradigms; Andrew S. Tanenbaum; Pearson
 * Raku Recipes; J.J. Merelo; Apress
+* The DevOps Handbook; Gene Kim, Jez Humble, Patrick Debois, John Willis; Audible
 * Go Brain Teasers - Exercise Your Mind; Miki Tebeka; The Pragmatic Programmers
-* Funktionale Programmierung; Peter Pepper; Springer
-* Java ist auch eine Insel; Christian Ullenboom; 
+* DNS and BIND; Cricket Liu; O'Reilly
+* Effective awk programming; Arnold Robbins; O'Reilly
 * The Go Programming Language; Alan A. A. Donovan; Addison-Wesley Professional
-* The DevOps Handbook; Gene Kim, Jez Humble, Patrick Debois, John Willis; Audible
-* Programming Perl aka "The Camel Book"; Tom Christiansen, brian d foy, Larry Wall & Jon Orwant; O'Reilly
-* Systems Performance Tuning; Gian-Paolo D. Musumeci and others...; O'Reilly
-* Higher Order Perl; Mark Dominus; Morgan Kaufmann
-* 97 things every SRE should know; Emil Stolarsky, Jaime Woo; O'Reilly
-* Site Reliability Engineering; How Google runs production systems; O'Reilly
-* Effective Java; Joshua Bloch; Addison-Wesley Professional
-* Leanring eBPF; Liz Rice; O'Reilly
-* Learn You Some Erlang for Great Good; Fred Herbert; No Starch Press
-* Raku Fundamentals; Moritz Lenz; Apress
 * DevOps And Site Reliability Engineering Handbook; Stephen Fleming; Audible
-* The Pragmatic Programmer; David Thomas; Addison-Wesley
-* Ultimate Go Notebook; Bill Kennedy
-* The KCNA (Kubernetes and Cloud Native Associate) Book; Nigel Poulton
-* Clusterbau mit Linux-HA; Michael Schwartzkopff; O'Reilly
-* Modern Perl; Chromatic ; Onyx Neon Press
-* C++ Programming Language; Bjarne Stroustrup;
-* Concurrency in Go; Katherine Cox-Buday; O'Reilly
-* Terraform Cookbook; Mikael Krief; Packt Publishing
-* Tmux 2: Productive Mouse-free Development; Brain P. Hogan; The Pragmatic Programmers 
-* Effective awk programming; Arnold Robbins; O'Reilly
-* 21st Century C: C Tips from the New School; Ben Klemens; O'Reilly
 * Pro Puppet; James Turnbull, Jeffrey McCune; Apress
-* Think Raku (aka Think Perl 6); Laurent Rosenfeld, Allen B. Downey; 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
-* Hands-on Infrastructure Monitoring with Prometheus; Joel Bastos, Pedro Araujo; Packt 
-* Data Science at the Command Line; Jeroen Janssens; O'Reilly
-* Learn You a Haskell for Great Good!; Miran Lipovaca; No Starch Press
+* The Kubernetes Book; Nigel Poulton; Unabridged Audiobook
+* The Pragmatic Programmer; David Thomas; Addison-Wesley
+* Site Reliability Engineering; How Google runs production systems; O'Reilly
 * Kubernetes Cookbook; Sameer Naik, Sébastien Goasguen, Jonathan Michaux; O'Reilly
+* Higher Order Perl; Mark Dominus; Morgan Kaufmann
+* Hands-on Infrastructure Monitoring with Prometheus; Joel Bastos, Pedro Araujo; Packt 
+* Learn You Some Erlang for Great Good; Fred Herbert; No Starch Press
+* Object-Oriented Programming with ANSI-C; Axel-Tobias Schreiner
 * Polished Ruby Programming; Jeremy Evans; Packt Publishing
 * Amazon Web Services in Action; Michael Wittig and Andreas Wittig; Manning Publications
-=======
-* Java ist auch eine Insel; Christian Ullenboom; 
-* Hands-on Infrastructure Monitoring with Prometheus; Joel Bastos, Pedro Araujo; Packt 
-* Modern Perl; Chromatic ; Onyx Neon Press
-* Systemprogrammierung in Go; Frank Müller; dpunkt
-* The Go Programming Language; Alan A. A. Donovan; Addison-Wesley Professional
 * Effective Java; Joshua Bloch; Addison-Wesley Professional
+* 97 things every SRE should know; Emil Stolarsky, Jaime Woo; O'Reilly
+* Systems Performance Tuning; Gian-Paolo D. Musumeci and others...; O'Reilly
+* Developing Games in Java; David Brackeen and others...; New Riders
+* Systemprogrammierung in Go; Frank Müller; dpunkt
+* Programming Perl aka "The Camel Book"; Tom Christiansen, brian d foy, Larry Wall & Jon Orwant; O'Reilly
+* Tmux 2: Productive Mouse-free Development; Brain P. Hogan; The Pragmatic Programmers 
+* Distributed Systems: Principles and Paradigms; Andrew S. Tanenbaum; Pearson
 * Concurrency in Go; Katherine Cox-Buday; O'Reilly
-* Pro Puppet; James Turnbull, Jeffrey McCune; Apress
-* Object-Oriented Programming with ANSI-C; Axel-Tobias Schreiner
-* Think Raku (aka Think Perl 6); Laurent Rosenfeld, Allen B. Downey; O'Reilly
-* The KCNA (Kubernetes and Cloud Native Associate) Book; Nigel Poulton
-* The DevOps Handbook; Gene Kim, Jez Humble, Patrick Debois, John Willis; Audible
+* Modern Perl; Chromatic ; Onyx Neon Press
 * Ultimate Go Notebook; Bill Kennedy
-* Higher Order Perl; Mark Dominus; Morgan Kaufmann
-* Tmux 2: Productive Mouse-free Development; Brain P. Hogan; The Pragmatic Programmers 
-* Data Science at the Command Line; Jeroen Janssens; O'Reilly
-* Systems Performance Tuning; Gian-Paolo D. Musumeci and others...; O'Reilly
-* Effective awk programming; Arnold Robbins; O'Reilly
+* Think Raku (aka Think Perl 6); Laurent Rosenfeld, Allen B. Downey; O'Reilly
+* Funktionale Programmierung; Peter Pepper; Springer
 * 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
-* Learn You a Haskell for Great Good!; Miran Lipovaca; No Starch Press
-* Go Brain Teasers - Exercise Your Mind; Miki Tebeka; The Pragmatic Programmers
 * The Docker Book; James Turnbull; Kindle
-* Amazon Web Services in Action; Michael Wittig and Andreas Wittig; Manning Publications
-* Polished Ruby Programming; Jeremy Evans; Packt Publishing
-* Learn You Some Erlang for Great Good; Fred Herbert; No Starch Press
-* Perl New Features; Joshua McAdams, brian d foy; Perl School
-* Raku Fundamentals; Moritz Lenz; Apress
-* DevOps And Site Reliability Engineering Handbook; Stephen Fleming; Audible
-* Developing Games in Java; David Brackeen and others...; New Riders
+* Java ist auch eine Insel; Christian Ullenboom; 
 * Clusterbau mit Linux-HA; Michael Schwartzkopff; O'Reilly
-* Programming Perl aka "The Camel Book"; Tom Christiansen, brian d foy, Larry Wall & Jon Orwant; O'Reilly
-* C++ Programming Language; Bjarne Stroustrup;
-* Distributed Systems: Principles and Paradigms; Andrew S. Tanenbaum; Pearson
+* Raku Fundamentals; Moritz Lenz; Apress
+* Perl New Features; Joshua McAdams, brian d foy; Perl School
 * Terraform Cookbook; Mikael Krief; Packt Publishing
-* DNS and BIND; Cricket Liu; O'Reilly
-* 100 Go Mistakes and How to Avoid Them; Teiva Harsanyi; Manning Publications
-* Funktionale Programmierung; Peter Pepper; Springer
-* Kubernetes Cookbook; Sameer Naik, Sébastien Goasguen, Jonathan Michaux; O'Reilly
-* Site Reliability Engineering; How Google runs production systems; O'Reilly
-* Raku Recipes; J.J. Merelo; Apress
-* 97 things every SRE should know; Emil Stolarsky, Jaime Woo; O'Reilly
-* The Pragmatic Programmer; David Thomas; Addison-Wesley
-* Leanring eBPF; Liz Rice; O'Reilly
-* 21st Century C: C Tips from the New School; Ben Klemens; O'Reilly
-* The Kubernetes Book; Nigel Poulton; Unabridged Audiobook
->>>>>>> 25ccc92b78135a5e494b170b65329e2b88b10815
+* Data Science at the Command Line; Jeroen Janssens; O'Reilly
 
 ## 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
+* Relayd and Httpd Mastery; Michael W Lucas
 * BPF Performance Tools - Linux System and Application Observability, Brendan Gregg; Addison Wesley
-* Understanding the Linux Kernel; Daniel P. Bovet, Marco Cesati; O'Reilly
 * The Linux Programming Interface; Michael Kerrisk; No Starch Press 
-* Implementing Service Level Objectives; Alex Hidalgo; O'Reilly
-* Relayd and Httpd Mastery; Michael W Lucas
-* Groovy Kurz & Gut; Joerg Staudemeier; O'Reilly
-* Algorithms; Robert Sedgewick, Kevin Wayne; Addison Wesley
-=======
 * Understanding the Linux Kernel; Daniel P. Bovet, Marco Cesati; O'Reilly
-* Implementing Service Level Objectives; Alex Hidalgo; O'Reilly
-* Relayd and Httpd Mastery; Michael W Lucas
 * Algorithms; Robert Sedgewick, Kevin Wayne; Addison Wesley
-* BPF Performance Tools - Linux System and Application Observability, Brendan Gregg; Addison Wesley
 * Groovy Kurz & Gut; Joerg Staudemeier; O'Reilly
-* The Linux Programming Interface; Michael Kerrisk; No Starch Press 
->>>>>>> 25ccc92b78135a5e494b170b65329e2b88b10815
+* Implementing Service Level Objectives; Alex Hidalgo; O'Reilly
 
 ## Self-development and soft-skills books
 
 In random order:
 
-<<<<<<< HEAD
-* Psycho-Cybernetics; Maxwell Maltz; Perigee Books
-* The Bullet Journal Method; Ryder Carroll; Fourth Estate
-* The Power of Now; Eckhard Tolle; Yellow Kite
-* 101 Essays that change the way you think; Brianna Wiest; Audible
-* The Off Switch; Mark Cropley; Virgin Books
-* Eat That Frog!; Brian Tracy; Hodder Paperbacks
-* Influence without Authority; A. Cohen, D. Bradford; Wiley
 * Search Inside Yourself - The Unexpected path to Achieving Success, Happiness (and World Peace); Chade-Meng Tan, Daniel Goleman, Jon Kabat-Zinn; HarperOne
-* The Joy of Missing Out; Christina Crook; New Society Publishers
+* The Obstacle Is The Way; Ryan Holiday; Profile Books Ltd
+* Psycho-Cybernetics; Maxwell Maltz; Perigee Books
 * Who Moved My Cheese?; Dr. Spencer Johnson; Vermilion 
-* The Good Enough Job; Simone Stolzoff; Ebury Edge
-* The Daily Stoic; Ryan Holiday, Stephen Hanselman; Profile Books
-* Ultralearning; Scott Young; Thorsons
-* Staff Engineer: Leadership beyond the management track; Will Larson; Audible
-* Solve for Happy; Mo Gawdat
-* Soft Skills; John Sommez; Manning Publications
-* The 7 Habits Of Highly Effective People; Stephen R. Covey; Simon & Schuster UK
-* Time Management for System Administrators; Thomas A. Limoncelli; O'Reilly
 * Eat That Frog; Brian Tracy
-* The Obstacle Is The Way; Ryan Holiday; Profile Books Ltd
-* Atomic Habits; James Clear; Random House Business
-* The Phoenix Project - A Novel About IT, DevOps, and Helping your Business Win; Gene Kim and Kevin Behr; Trade Select
-* Never Split the Difference; Chris Voss, Tahl Raz; Random House Business
-* Getting Things Done; David Allen
-* The Complete Software Developer's Career Guide; John Sonmez; Unabridged Audiobook
-* Digital Minimalism; Cal Newport; Portofolio Penguin
-* Consciousness: A Very Short Introduction; Susan Blackmore; Oxford Uiversity Press
-* Deep Work; Cal Newport; Piatkus
-* Buddah and Einstein walk into a Bar; Guy Joseph Ale, Claire Bloom; Blackstone Publishing
+* The Good Enough Job; Simone Stolzoff; Ebury Edge
 * Stop starting, start finishing; Arne Roock; Lean-Kanban University  
-* Ultralearning; Anna Laurent; Self-published via Amazon
+* Digital Minimalism; Cal Newport; Portofolio Penguin
+* Solve for Happy; Mo Gawdat
 * Slow Productivity; Cal Newport; Penguin Random House
 * So Good They Can't Ignore You; Cal Newport; Business Plus
-=======
-* Solve for Happy; Mo Gawdat
+* The Joy of Missing Out; Christina Crook; New Society Publishers
+* Ultralearning; Scott Young; Thorsons
+* Staff Engineer: Leadership beyond the management track; Will Larson; Audible
 * Deep Work; Cal Newport; Piatkus
-* Who Moved My Cheese?; Dr. Spencer Johnson; Vermilion 
 * The Bullet Journal Method; Ryder Carroll; Fourth Estate
-* Digital Minimalism; Cal Newport; Portofolio Penguin
-* 101 Essays that change the way you think; Brianna Wiest; Audible
+* The 7 Habits Of Highly Effective People; Stephen R. Covey; Simon & Schuster UK
+* Eat That Frog!; Brian Tracy; Hodder Paperbacks
+* Atomic Habits; James Clear; Random House Business
+* Getting Things Done; David Allen
 * The Daily Stoic; Ryan Holiday, Stephen Hanselman; Profile Books
 * Consciousness: A Very Short Introduction; Susan Blackmore; Oxford Uiversity Press
-* Atomic Habits; James Clear; Random House Business
-* Staff Engineer: Leadership beyond the management track; Will Larson; Audible
-* The Phoenix Project - A Novel About IT, DevOps, and Helping your Business Win; Gene Kim and Kevin Behr; Trade Select
-* Time Management for System Administrators; Thomas A. Limoncelli; O'Reilly
+* Influence without Authority; A. Cohen, D. Bradford; Wiley
 * The Power of Now; Eckhard Tolle; Yellow Kite
-* 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; Audible
+* Soft Skills; John Sommez; Manning Publications
+* Ultralearning; Anna Laurent; Self-published via Amazon
 * The Off Switch; Mark Cropley; Virgin Books
+* Time Management for System Administrators; Thomas A. Limoncelli; O'Reilly
+* The Phoenix Project - A Novel About IT, DevOps, and Helping your Business Win; Gene Kim and Kevin Behr; Trade Select
 * Buddah and Einstein walk into a Bar; Guy Joseph Ale, Claire Bloom; Blackstone Publishing
-* Ultralearning; Anna Laurent; Self-published via Amazon
-* Stop starting, start finishing; Arne Roock; Lean-Kanban University  
-* The Good Enough Job; Simone Stolzoff; Ebury Edge
-* So Good They Can't Ignore You; Cal Newport; Business Plus
-* The Joy of Missing Out; Christina Crook; New Society Publishers
-* The Complete Software Developer's Career Guide; John Sonmez; Unabridged Audiobook
-* Soft Skills; John Sommez; Manning Publications
-* Influence without Authority; A. Cohen, D. Bradford; Wiley
-* Eat That Frog!; Brian Tracy; Hodder Paperbacks
 * Never Split the Difference; Chris Voss, Tahl Raz; Random House Business
-* Getting Things Done; David Allen
-* Slow Productivity; Cal Newport; Penguin Random House
-* Ultralearning; Scott Young; Thorsons
-* The Obstacle Is The Way; Ryan Holiday; Profile Books Ltd
-* The 7 Habits Of Highly Effective People; Stephen R. Covey; Simon & Schuster UK
-* Eat That Frog; Brian Tracy
-* Psycho-Cybernetics; Maxwell Maltz; Perigee Books
->>>>>>> 25ccc92b78135a5e494b170b65329e2b88b10815
+* The Complete Software Developer's Career Guide; John Sonmez; Unabridged Audiobook
 
 [Here are notes of mine for some of the books](../notes/index.md)  
 
@@ -231,41 +137,22 @@ 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
-* Developing IaC with Terraform (with Live Lessons); O'Reilly Online
+* Scripting Vim; Damian Conway; O'Reilly Online
+* Protocol buffers; O'Reilly Online
+* Functional programming lecture; Remote University of Hagen
+* MySQL Deep Dive Workshop; 2-day on-site training
 * Apache Tomcat Best Practises; 3-day on-site training
-* F5 Loadbalancers Training; 2-day on-site training; F5, Inc. 
 * Structure and Interpretation of Computer Programs; Harold Abelson and more...; 
-* MySQL Deep Dive Workshop; 2-day on-site training
-* Scripting Vim; Damian Conway; 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
-* The Well-Grounded Rubyist Video Edition; David. A. Black; O'Reilly Online
-* Linux Security and Isolation APIs Training; Michael Kerrisk; 3-day on-site training
-* Protocol buffers; 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)
-* Functional programming lecture; Remote University of Hagen
 * The Ultimate Kubernetes Bootcamp; School of Devops; O'Reilly Online
-* AWS Immersion Day; Amazon; 1-day interactive online training 
-=======
-* Functional programming lecture; Remote University of Hagen
+* F5 Loadbalancers Training; 2-day on-site training; F5, Inc. 
 * Developing IaC with Terraform (with Live Lessons); O'Reilly Online
-* The Well-Grounded Rubyist Video Edition; David. A. Black; O'Reilly Online
 * AWS Immersion Day; Amazon; 1-day interactive online training 
-* Apache Tomcat Best Practises; 3-day on-site training
-* Linux Security and Isolation APIs Training; Michael Kerrisk; 3-day on-site training
-* Scripting Vim; Damian Conway; O'Reilly Online
-* The Ultimate Kubernetes Bootcamp; School of Devops; O'Reilly Online
-* Algorithms Video Lectures; Robert Sedgewick; 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)
-* MySQL Deep Dive Workshop; 2-day on-site training
-* Structure and Interpretation of Computer Programs; Harold Abelson and more...; 
 * Ultimate Go Programming; Bill Kennedy; O'Reilly Online
+* Linux Security and Isolation APIs Training; Michael Kerrisk; 3-day on-site training
+* The Well-Grounded Rubyist Video Edition; David. A. Black; 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
-* F5 Loadbalancers Training; 2-day on-site training; F5, Inc. 
->>>>>>> 25ccc92b78135a5e494b170b65329e2b88b10815
 
 ## Technical guides
 
@@ -281,84 +168,46 @@ These are not whole books, but guides (smaller or larger) which I found very use
 
 In random order:
 
-<<<<<<< HEAD
-* Hidden Brain
+* Maintainable
+* Deep Questions with Cal Newport
 * BSD Now
 * Fork Around And Find Out
-* Backend Banter
+* Hidden Brain
+* The Changelog Podcast(s)
 * Dev Interrupted
-* The Pragmatic Engineer Podcast
-* The ProdCast (Google SRE Podcast)
 * Cup o' Go [Golang]
-* Deep Questions with Cal Newport
-* Fallthrough [Golang]
-* The Changelog Podcast(s)
-* Maintainable
-=======
-* Maintainable
-* Fork Around And Find Out
-* Deep Questions with Cal Newport
 * Backend Banter
-* Dev Interrupted
-* Hidden Brain
-* The Changelog Podcast(s)
 * The Pragmatic Engineer Podcast
 * The ProdCast (Google SRE Podcast)
-* BSD Now
-* Cup o' Go [Golang]
 * Fallthrough [Golang]
->>>>>>> 25ccc92b78135a5e494b170b65329e2b88b10815
 
 ### 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
-* FLOSS weekly
-* CRE: Chaosradio Express [german]
-* Ship It (predecessor of Fork Around And Find Out)
-* Modern Mentor
+* Go Time (predecessor of fallthrough)
 * Java Pub House
-=======
 * CRE: Chaosradio Express [german]
-* Java Pub House
-* Modern Mentor
 * FLOSS weekly
 * Ship It (predecessor of Fork Around And Find Out)
->>>>>>> 25ccc92b78135a5e494b170b65329e2b88b10815
-* Go Time (predecessor of fallthrough)
+* Modern Mentor
 
 ## Newsletters I like
 
 This is a mix of tech and non-tech newsletters I am subscribed to. In random order:
 
-<<<<<<< HEAD
-* Andreas Brandhorst Newsletter (Sci-Fi author)
-* Applied Go Weekly Newsletter
-* byteSizeGo
-* Register Spill
 * The Pragmatic Engineer
-* Ruby Weekly
 * Golang Weekly
-* VK Newsletter
-* The Valuable Dev
-* Changelog News
+* Applied Go Weekly Newsletter
 * Monospace Mentor
+* The Valuable Dev
 * The Imperfectionist
-=======
 * VK Newsletter
-* The Pragmatic Engineer
+* Ruby Weekly
 * Andreas Brandhorst Newsletter (Sci-Fi author)
-* The Imperfectionist
+* Register Spill
 * byteSizeGo
-* Golang Weekly
-* Monospace Mentor
 * Changelog News
-* Applied Go Weekly Newsletter
-* Register Spill
-* Ruby Weekly
-* The Valuable Dev
->>>>>>> 25ccc92b78135a5e494b170b65329e2b88b10815
 
 # Formal education