merge finished

.gitignore

@@ -30,15 +30,5 @@ codekit-config.json
 .sass-cache
 _asset_bundler_cache
 _site
-<<<<<<< HEAD
 docs
 CHANGELOG.MD
-=======
-docs/Rakefile
-docs/_data/theme.yml
-docs/_docs/22-faq.md
-docs/_includes/after-content.html
-docs/_includes/before-related.html
-docs/_includes/comments-providers/scripts.html
-docs/_posts/2009-10-06-edge-case-broken-highlighting.md
->>>>>>> d0fa738f (rebase from mnml mistakes source)

Gemfile

@@ -7,10 +7,7 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-<<<<<<< HEAD
 gem "json"
-=======
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 gem "jekyll"
 gem "minimal-mistakes-jekyll"
 
@@ -35,8 +32,5 @@ group :jekyll_plugins do
   gem 'jemoji'
   gem 'jekyll-archives'
   gem 'jekyll-include-cache'
-<<<<<<< HEAD
   gem 'jekyll-webp'
-=======
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 end

_bibliography.bib

@@ -100,18 +100,11 @@ organization={Conference on Artificial Life - Alife 2023},
   publisher={Copernicus Publications Göttingen, Germany}
 }
 
-<<<<<<< HEAD
 @inproceedings{illium2020surgical,
   title={Surgical Mask Detection with Convolutional Neural Networks and Data Augmentations on Spectrograms},
   author={Illium, Steffen and M{\"u}ller, Robert and Sedlmeier, Andreas and Linnhoff-Popien, Claudia},
   booktitle={Proc. Interspeech 2020},
   pages={2052--2056},
-=======
-@article{illium2020surgical,
-  title={Surgical mask detection with convolutional neural networks and data augmentations on spectrograms},
-  author={Illium, Steffen and Müller, Robert and Sedlmeier, Andreas and Linnhoff-Popien, Claudia},
-  journal={arXiv preprint arXiv:2008.04590},
->>>>>>> d0fa738f (rebase from mnml mistakes source)
   year={2020}
 }
 
@@ -201,7 +194,6 @@ organization={Conference on Artificial Life - Alife 2023},
   organization={Springer International Publishing Cham}
 }
 
-<<<<<<< HEAD
 @inproceedings{illium2022constructing,
   title={Constructing organism networks from collaborative self-replicators},
   author={Illium, Steffen and Zorn, Maximilian and Lenta, Cristian and K{\"o}lle, Michael and Linnhoff-Popien, Claudia and Gabor, Thomas},
@@ -219,20 +211,6 @@ organization={Conference on Artificial Life - Alife 2023},
   number={Volume 3},
   pages={350--357},
   year={2023}
-=======
-@article{illium2022constructing,
-  title={Constructing Organism Networks from Collaborative Self-Replicators},
-  author={Illium, Steffen and Zorn, Maximilian and Kölle, Michael and Linnhoff-Popien, Claudia and Gabor, Thomas},
-  journal={arXiv preprint arXiv:2212.10078},
-  year={2022}
-}
-
-@article{illium2022voronoipatches,
-  title={VoronoiPatches: Evaluating A New Data Augmentation Method},
-  author={Illium, Steffen and Griffin, Gretchen and Kölle, Michael and Zorn, Maximilian and Nü{\ss}lein, Jonas and Linnhoff-Popien, Claudia},
-  journal={arXiv preprint arXiv:2212.10054},
-  year={2022}
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 }
 
 @article{kolle2023compression,
@@ -240,7 +218,7 @@ organization={Conference on Artificial Life - Alife 2023},
   author={Kölle, Michael and Illium, Steffen and Hahn, Carsten and Schauer, Lorenz and Hutter, Johannes and Linnhoff-Popien, Claudia},
   journal={arXiv preprint arXiv:2301.07420},
   year={2023}
-<<<<<<< HEAD
+
 }
 
 @inproceedings{altmann2024emergence,
@@ -257,6 +235,5 @@ organization={Conference on Artificial Life - Alife 2023},
   author={Kölle, Michael and Erpelding, Yannick and Ritz, Fabian and Phan, Thomy and Illium, Steffen and Linnhoff-Popien, Claudia},
   journal={arXiv preprint arXiv:2401.07056},
   year={2024}
-=======
+
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 }

_config.yml

@@ -26,17 +26,10 @@ description              : "Personal Website"
 url                      : "https://steffenillium.de" # the base hostname & protocol for your site e.g. "https://mmistakes.github.io"
 baseurl                  : "" # the subpath of your site, e.g. "/blog"
 repository               : "illiumst" # GitHub username/repo-name e.g. "mmistakes/minimal-mistakes"
-<<<<<<< HEAD
 teaser                   : "/assets/images/newshot_2.jpg" # path of fallback teaser image, e.g. "/assets/images/500x300.png"
 logo                     : # path of logo image to display in the masthead, e.g. "/assets/images/88x88.png"
 masthead_title           : "portfolio" # overrides the website title displayed in the masthead, use " " for no title
 breadcrumbs              : false # true, false (default)
-=======
-teaser                   : "/assets/images/headshot.jpg" # path of fallback teaser image, e.g. "/assets/images/500x300.png"
-logo                     : # path of logo image to display in the masthead, e.g. "/assets/images/88x88.png"
-masthead_title           : "portfolio" # overrides the website title displayed in the masthead, use " " for no title
-breadcrumbs              : true # true, false (default)
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 words_per_minute         : 200
 reCaptcha:
   siteKey                :
@@ -57,28 +50,18 @@ analytics:
   provider: "custom"
 
 # Social Sharing
-<<<<<<< HEAD
 og_image                 : "/assets/images/newshot_2.jpg" # Open Graph/Twitter default site image
 # For specifying social profiles
 # - https://developers.google.com/structured-data/customize/social-profiles
 social:
   type                   : Person
   name                   : Steffen Illium
-=======
-og_image                 : "/assets/images/headshot.jpg" # Open Graph/Twitter default site image
-# For specifying social profiles
-# - https://developers.google.com/structured-data/customize/social-profiles
-social:
-  type                   : # Person or Organization (defaults to Person)
-  name                   : # If the user or organization name differs from the site's name
->>>>>>> d0fa738f (rebase from mnml mistakes source)
   links                  : # An array of links to social media profiles
     - https://www.linkedin.com/in/steffen-illium/
 
 # Site Author
 author:
   name             : "Steffen Illium"
-<<<<<<< HEAD
   avatar           : "/assets/images/newshot_2.jpg" # path of avatar image, e.g. "/assets/images/bio-photo.jpg"
   bio              : "[PhD. in Comp. Science](https://www.mobile.ifi.lmu.de/team/steffen-illium/) <br>[AI Consultant & Researcher](/research/)"
   location         : "Augsburg"
@@ -88,33 +71,15 @@ author:
       url: "https://www.mobile.ifi.lmu.de/team/steffen-illium/"
     - label: "Scholar"
       icon: "fab fa-google-scholar"
-=======
-  avatar           : "/assets/images/headshot.jpg" # path of avatar image, e.g. "/assets/images/bio-photo.jpg"
-  bio              : "[AI Research](/research/) and [Lecturer](/teaching/) as [PHD Student](https://www.mobile.ifi.lmu.de/team/steffen-illium/) @ [LMU Munich](https://www.lmu.de/en/index.html)"
-  location         : "Augsburg"
-  links:
-    - label: "LMU-Munich"
-      icon: "fas fa-link"
-      url: "https://www.mobile.ifi.lmu.de/team/steffen-illium/"
-    - label: "Scholar"
-      icon: "ai ai-google-scholar"
->>>>>>> d0fa738f (rebase from mnml mistakes source)
       url: "https://scholar.google.de/citations?hl=en&pli=1&user=NODAd94AAAAJ"
     - label: "Arxive"
       icon: "ai ai-arxiv"
       url: "https://arxiv.org/a/illium_s_1.html"
     - label: "Researchgate"
-<<<<<<< HEAD
       icon: "fab fa-researchgate"
       url: "https://www.researchgate.net/profile/Steffen-Illium"
 
 
-=======
-      icon: "ai ai-researchgate"
-      url: "https://www.researchgate.net/profile/Steffen-Illium"
-
-    
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 
 # Site Footer
 footer:
@@ -125,15 +90,9 @@ footer:
     - label: "LinkedIn"
       icon: "fab fa-fw fa-linkedin"
       url: "https://www.linkedin.com/in/steffen-illium/"
-<<<<<<< HEAD
     - label: "Gitea"
       icon: "fab fa-git-alt"
       url: "https://gitea.steffenillium.de/steffen"
-=======
-    - label: "GitHub"
-      icon: "fab fa-fw fa-github"
-      url: "https://github.com/illiumst"
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 
 
 # Reading Files
@@ -245,10 +204,7 @@ plugins:
   - jekyll-scholar
   - jekyll-data
   - jekyll-archives
-<<<<<<< HEAD
   - jekyll-webp
-=======
->>>>>>> d0fa738f (rebase from mnml mistakes source)
   - jemoji
 
 # mimic GitHub Pages with --safe
@@ -310,7 +266,6 @@ defaults:
       comments: false
       share: false
       related: true
-<<<<<<< HEAD
       related: true
       show_date: false
 
@@ -326,28 +281,12 @@ scholar:
   bibliography: _bibliography.bib
   repository: "./assets/publications"
   bibliography_template: bibtemplate
-=======
-      related: false
-      show_date: true
-
-
-# Footer
-footer_scripts:
-  - /assets/js/main.min.js
-  - /assets/js/custom-bibtex.js
-
-
-scholar:
-  style: acm-siggraph
-  bibliography: _bibliography.bib
->>>>>>> d0fa738f (rebase from mnml mistakes source)
   source: ""
   sort_by: year,month
   order: descending
   group_by: year
   group_order: descending
   relative: "/publications"
-<<<<<<< HEAD
 
 ############################################################
 # Site configuration for the WebP Generator Plugin
@@ -387,5 +326,3 @@ webp:
   # Default transforms `image.png` to `image.webp`, while changing to true transforms `image.png` to `image.png.webp`
   append_ext: true
 ############################################################
-=======
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/projects/2018-02-01-innomi.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "InnoMi Project"
 categories: projects
 excerpt: "Early-stage mobile/distributed tech transfer between academia and industry (Bavaria)."
@@ -30,16 +29,3 @@ header:
 *   **Dissemination & Editorial Leadership:** To further bridge the gap between cutting-edge digitalization trends and industry practitioners, I served as the Head of the Online Editorial Team for the associated [Digitale Welt Magazin (DW)](https://digitaleweltmagazin.de/) from 2018 to 2023, a role supported by the InnoMi initiative.
 
 This project provided a platform not only for advancing research but also for developing crucial skills in project communication, event management, and editorial leadership, directly contributing to the technology transfer goals of the Bavarian region.
-=======
-title:  "Mobile Internet Innovations"
-categories: projects
-excerpt: "Aiming to make Bavaria more economically strong by transferring innovations from the university to industry at an early stage."
-header:
-  teaser: assets/images/projects/innomi.png
-
----
-
-![logo](/assets/images/projects/innomi.png){: .align-left style="padding:0.1em; width:5em"}
-
-
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/projects/2019-02-24-dw.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "DW Editorial Lead"
 categories: projects
 excerpt: "Led online editorial team for DIGITALE WELT Magazin (2018-2023)."
@@ -41,14 +40,3 @@ Prior to leading the online team, I contributed to the print editions of the mag
   <figcaption>Examples of DIGITALE WELT Print Magazine Covers</figcaption>
 </center>
 <br>
-=======
-title:  "Leading an editorial office."
-categories: projects
-excerpt: "A unique line of text to describe this post that will display in an archive listing and meta description with SEO benefits."
-header:
-  teaser: assets/images/projects/dw.png
-
----
-
-![logo](\assets\images\projects\dw.png){: .align-left style="padding:0.1em; width:5em"}
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/projects/2019-02-24-water-networks.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "ErLoWa Leak Detection"
 categories: projects
 excerpt: "Deep learning detects acoustic water leaks with SWM."
@@ -60,15 +59,3 @@ In collaboration with Munich's municipal utility provider, Stadtwerke München (
 This applied research project provided valuable experience in handling real-world sensor data, adapting machine learning models for specific industrial challenges, and collaborating effectively with industry partners.
 
 {% include reference.html %}
-=======
-title:  "Detection and localization of leakages in water networks."
-categories: projects
-excerpt: "A u"
-tags: acoustic anomaly-detection 
-header:
-  teaser: assets/images/projects/pipe_leak.png
-
----
-
-![Leaking pipe image](/assets/images/projects/pipe_leak.png){: .align-left style="padding:0.1em; width:5em"}
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/projects/2019-10-15-OpenMunich.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "OpenMunich Conference Organization"
 categories: projects
 tags: community-engagement
@@ -35,14 +34,3 @@ The OpenMunich conference series during 2016 until 2019 offered a platform to sh
 *   **Sponsorship Liaison:** Coordinated with Accenture and Red Hat regarding their sponsorship contributions and participation requirements.
 
 This role required organizational skills, effective communication across diverse stakeholder groups, and project management to ensure the successful delivery of the conference.
-=======
-title:  "OpenMunich.eu - Conference Organisation"
-categories: acoustic anomaly-detection projects
-excerpt: "Organization a Munich based open-souce conference with Red Hat and Accenture"
-header:
-  teaser: assets/images/projects/openmunich.png
-
----
-
-![logo](\assets\images\projects\openmunich.png){: .align-left style="padding:0.1em; width:5em"}
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/projects/2020-05-01-FIKS.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "AI-Fusion Safety"
 categories: projects
 tags: multi-agent-systems reinforcement-learning safety emergence simulation
@@ -68,14 +67,3 @@ To facilitate research into these phenomena, key contributions included the deve
 This project involved close collaboration with industry-focused researchers, software development adhering to modern standards, and deep investigation into the theoretical underpinnings of emergence and safety in MARL systems. The developed tools provide a valuable platform for continued research in this critical area.
 
 {% include reference.html %}
-=======
-title:  "AI-Fusion: Emergence Detection for mixed MARL systems."
-categories: acoustic anomaly-detection projects
-excerpt: "Bringing together agents can be an inherent safety problem. Building the basis to mix and match."
-header:
-  teaser: assets/images/projects/robot.png
-
----
-
-![logo](\assets\images\projects\robot.png){: .align-left style="padding:0.1em; width:5em"}
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/projects/2023-10-15-server-administration.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "LMU DevOps Admin"
 categories: projects
 tags: devops kubernetes server-administration infrastructure
@@ -52,12 +51,3 @@ During my tenure at the LMU Chair for Mobile and Distributed Systems, alongside
 This hands-on role provided deep practical experience in modern system administration, networking, Infrastructure as Code (IaC), and cloud-native technologies within an academic research setting. It fostered my preference for minimalist, reproducible, and microservice-oriented architectures. These principles and skills are actively applied in my personal projects, including the self-hosting and management of this website and various other containerized services.
 
 A more comprehensive list of the technologies I work with can be found on the [About Me](/about/) page.
-=======
-title:  "Linux Server Administration"
-categories: projects server_admin unix
-excerpt: "Linux Server Administration (Workstations and Web)"
-header:
-  teaser: assets/images/projects/arch.png
----
-![logo](\assets\images\projects\arch.png){: .align-left style="padding:0.1em; width:5em"}
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/research/2020-03-01-soccer-team-vectors.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "Soccer Team Vectors"
 categories: research
 tags: machine-learning representation-learning sports-analytics similarity-search
@@ -22,16 +21,3 @@ The utility of these learned representations is demonstrated through several dow
 *   **Team Ranking:** The embeddings provide a basis for generating data-driven team rankings.
 
 Across these application domains, STEVE demonstrated superior performance compared to competing approaches evaluated in the study. This work provides a valuable tool for quantitative analysis in sports analytics, enabling various machine learning tasks related to team comparison and prediction. For a comprehensive description of the methodology and results, please refer to the publication by {% cite muller2020soccer %}.
-=======
-title:  "Learning Soccer-Team Vecors"
-categories: research 
-excerpt: "Team market value estimation, similarity search and rankings."
-header:
-  teaser: assets/figures/2_steve_algo.jpg
----
-
-In this work we present STEVE - Soccer TEam VEctors, a principled approach for learning real valued vectors for soccer teams where similar teams are close to each other in the resulting vector space. STEVE only relies on freely available information about the matches teams played in the past. These vectors can serve as input to various machine learning tasks. Evaluating on the task of team market value estimation, STEVE outperforms all its competitors. Moreover, we use STEVE for similarity search and to rank soccer teams.
-{% cite muller2020soccer %}
-
-![STEVE Algorithm](\assets\figures\2_steve_algo.jpg){:style="display:block; margin-left:auto; margin-right:auto;"}
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/teaching/2018-02-15-computer_achitecture.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "Computer Architecture TA"
 categories: teaching
 excerpt: "TA & Coordinator, LMU Computer Architecture course."
@@ -50,37 +49,3 @@ The course provided students with a comprehensive introduction to the fundamenta
   </div>
   <div style="clear: both;"></div>
 </div>
-=======
-title:  "Lecture: Computer Architectures"
-categories: teaching
-excerpt: "Assisting to manage a lecture about the technical foundations of computer science."
-header:
-  teaser: assets/images/teaching/computer_gear.png
----
-
-![logo](\assets\images\teaching\computer_gear.png){: .align-left style="padding:0.1em; width:5em"}In the semesters listed below, my job was to assist in organiszing this bachelors lecture of about 600 students.
-We had a team of 10-12 tutors that were employed to balance the workload.
-Also, we created each weeks graded exercise sheets as well as the written exam and organized it.
-
-### Contents
-<div class="table-right">
-
-| [Summer semester 2019](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/rechnerarchitektur-sose19/)| [Summer semester 2018](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/rechnerarchitektur-sose18/)|
-
-</div>This lecture provided an introduction to the technical foundations of computer science and the architecture of computers.
-Topics introduced in the lecture include representation of information in computers, classical components of a computer, arithmetic in computers, logical design of computers, switching circuits, representation of memory contents, primary and secondary memories, input and output, and pipelining.
-More concrete:
-
-- Representation as bits: (numbers, text, images, audio, video, programs).
-- Storage and Transfer of data, error detection and correction
-- Boolean algebra
-- Processing of data: circuit design, switching networks
-- Number representation and arithmetic
-- Switching functions, switching networks, switching plants
-- Von Neumann model
-- Machine model
-- Machine and assembly language programming
-- Introduction to Quantum Computing
-
-This lecture was held by Prof. Dr. Linnhoff-Popien titled "Rechnerarchitektur" at [https://www.mobile.ifi.lmu.de/](LMU).
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/teaching/2018-10-15-IOT.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "IoT Practical Exercise"
 categories: teaching
 tags: teaching iot mqtt python influxdb distributed-systems practical-course
@@ -60,22 +59,3 @@ The exercise aimed to solidify theoretical concepts discussed in the main lectur
   </div>
   <div style="clear: both;"></div>
 </div>
-=======
-title:  "IOT: Devices & Connectivity"
-categories: teaching
-tags: teaching iot
-excerpt: "Teaching to plan and develope distributed mobile apps for Android as a team."
-header:
-  teaser: assets/images/teaching/server.png
----
-
-![logo](\assets\images\teaching\server.png){: .align-left style="padding:0.1em; width:5em"}
-In the context of the lecture [Internet of Things (IoT)](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/iot-ws1819/), my task was to come up with a practical exercise which could be implemented in the scope of 1-2 classes. We went with a typical [MQQT](https://mqtt.org/) based communication approach, which incooperated an [InfluxDB](https://www.influxdata.com/) backend, while simulating some high frequency sensors.
-The task was to implement this all from scratch in [Python](https://www.python.org/), which was tought in seperate [lecture](/teaching/python).
-![IOT Influx Pipeline](\assets\figures\iot_inflex_pipeline.png){:style="display:block; margin-left:auto; margin-right:auto; padding: 2em;"}
-This practical course was held in front of about 200 students in winter 2018.
-
-### Contents
-
-The general topics of the lecture included: **1)** Arduino and Raspberry Pi, **2)** Wearables and ubiquitous computing, **3)** Metaheuristics for optimization problems, **4)** Edge/fog/cloud computing and storage, **5)** Scalable algorithms and approaches, **6)** Spatial data mining, **7)** Information retrieval and mining, **8)** Blockchain and digital consensus, **9)** Combinatorial optimization in practice, **10)** Predictive maintenance systems, **11)** Smart IoT applications, **12)** Cyber security & **13)** Web of Things
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/teaching/2018-10-30-Python.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "Python 101 Course"
 categories: teaching
 tags: teaching python programming introductory-course curriculum-development
@@ -43,19 +42,3 @@ The course structure balanced theoretical instruction with hands-on practical co
   </div>
   <div style="clear: both;"></div>
 </div>
-=======
-title:  "Lecture: Python 101"
-categories: teaching
-tags: teaching coding 
-excerpt: "Teaching the basics of python."
-header:
-  teaser: assets/images/teaching/py.png
----
-
-![logo](\assets\images\teaching\py.png){: .align-left style="padding:0.1em; width:5em"}
-The "Python 101"-Lecture was held within the context of the [IOT](/teaching/IOT/) lecture, held in winter semester 2018.
-Over the course of four classes, we tought an extensive introduction to the [`Python`](https://www.python.org/) programming language.
-Not only was the cource slides developed by me and my collegue, we also shared the lectures in front of about 200 students.
-
-There was also a practical part of the course, which allowed students to the practical acquisition of programming skills in the `Python` programming language.
->>>>>>> d0fa738f (rebase from mnml mistakes source)

_posts/teaching/2019-10-15-operating_systems.md

@@ -1,6 +1,5 @@
 ---
 layout: single
-<<<<<<< HEAD
 title: "Operating Systems TA"
 categories: teaching
 excerpt: "TA & Coordinator, Operating Systems lecture (~350 students), system programming."
@@ -48,31 +47,3 @@ The lecture built upon the foundations laid in [Computer Architecture](/teaching
 </div>
 
   Practical exercises emphasized concurrent programming using Java Threads.
-=======
-title:  "Lecture: Operating Systems"
-categories: teaching 
-excerpt: "Teaching the inner working of bits and bytes."
-header:
-  teaser: assets/images/teaching/computer_os.png
----
-
-![logo](\assets\images\teaching\computer_os.png){: .align-left style="padding:0.1em; width:5em"}In the semesters listed below, my job was to assist in organiszing this bachelors lecture of about 300-400 students.
-We had a team of 10-12 tutors that were employed to balance the workload.
-Also, we created each weeks graded exercise sheets as well as the written exam and organized it.
-
-### Content
-
-<div class="table-right">
-
-| [Winter semester 2019](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/bs-ws1920/)|
-| [Summer semester 2018](https://www.mobile.ifi.lmu.de/lehrveranstaltungen/bs-ws1819/)|
-
-</div>The lecture `Operating Systems` was a continuation of the lecture [`Computer Architecture`](teaching/computer_achitecture/) held in the summer semester.
-The focus of the lecture lay on presenting the concepts of system programming.
-This included the programming of the operating system and of service programs such as editors, compilers and interpreters.
-The lecture provided an overview of the main tasks and problem around operating system, with particular emphasis on the areas of synchronization, process communication, kernel and memory management.
-Java (in particular the Thread API) was used to teach the practical implementation of the concepts introduced in the lecture in the practical exercises.
-At the end of the lecture, the architecture of distributed systems, cross-computer communication and remote procedure calls was discussed, also.
-
-This lecture was held by Prof. Dr. Linnhoff-Popien titled `Betriebssysteme` at [LMU](https://www.mobile.ifi.lmu.de/).
->>>>>>> d0fa738f (rebase from mnml mistakes source)

blog.md

@@ -1,10 +1,4 @@
 ---
-<<<<<<< HEAD
-=======
-# Feel free to add content and custom Front Matter to this file.
-# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
-
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 title: "Blog"
 permalink: /blog/
 layout: category

nginx_default.conf

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Map to check if client is capable of handling webp
 map $http_accept $webp_suffix {
     default   "";
@@ -30,11 +29,6 @@ server {
         add_header Cache-Control "public";
 
         # Try to serve the .webp file first if browser supports it
-        # $image_path_without_ext comes from the map above
-        # $webp_suffix comes from the map above (.webp or empty)
-        # If $image_path_without_ext$webp_suffix exists (e.g., /path/image.webp), serve it.
-        # Otherwise, try the original $uri (e.g., /path/image.png).
-        # If neither exists, return 404.
         try_files $image_path_without_ext$webp_suffix $uri =404;
     }
 
@@ -59,29 +53,5 @@ server {
     gzip on;
     gzip_comp_level 4;
     gzip_types text/html text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
-=======
-server {
-    listen       80;
-    listen  [::]:80;
-    server_name  localhost;
 
-    #access_log  /var/log/nginx/host.access.log  main;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-    }
-
-    error_page  404              /404.html;
-    location = /404.html {
-        root   /usr/share/nginx/html;
-    }
-
-    # redirect server error pages to the static page /50x.html
-    #
-    #error_page   500 502 503 504  /50x.html;
-    #location = /50x.html {
-    #    root   /usr/share/nginx/html;
-    #}
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 }

projects.md

@@ -1,12 +1,5 @@
 ---
-<<<<<<< HEAD
 title: "Projects"
-=======
-# Feel free to add content and custom Front Matter to this file.
-# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
-
-title: "projects"
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 permalink: /projects/
 layout: category
 taxonomy: projects
@@ -14,7 +7,6 @@ author_profile: true
 entries_layout: list
 ---
 
-<<<<<<< HEAD
 This section details key projects undertaken during my tenure as a Research Assistant and PhD candidate at the [Chair for Mobile and Distributed Systems](http://www.mobile.ifi.lmu.de/), LMU Munich (2018-2024), as well as subsequent engagements.
 
 My involvement spanned a diverse range of initiatives, encompassing foundational research, applied projects in collaboration with industry partners such as Stadtwerke München (SWM) and the Fraunhofer Institute for Cognitive Systems (IKS), and significant contributions to academic community organization and outreach. Across these projects, I assumed various responsibilities, including researcher, technical lead, project communicator, conference organizer, and editorial lead.
@@ -24,12 +16,3 @@ The following list provides an overview of these varied engagements, highlightin
 ## List of Projects
 
 ---
-=======
-Here you will find an overview of the projects I worked on at the [mobile and distributed systems chair](http://www.mobile.ifi.lmu.de/).
-I had multiple roles within my time, such as technician, researcher, project communicator, conference organizer, and editor-in-chief.
-Therefore, this list consists of a mix of real industrial projects (in cooperation with SWA and Fraunhofer) and what we call “hobbies” within the chair's reach.
-
-## List of Projects
-
----
->>>>>>> d0fa738f (rebase from mnml mistakes source)

publications.md

@@ -1,5 +1,4 @@
 ---
-<<<<<<< HEAD
 title: "Publications"
 permalink: /publications/
 layout: single
@@ -19,22 +18,6 @@ Key areas of investigation reflected in my publications include:
 The publications listed below represent significant outputs from my doctoral studies at LMU Munich and ongoing research activities, contributing to both foundational knowledge and practical solutions.
 
 For a comprehensive and continuously updated list of my publications, please visit my profile on <a href="{{ page.scholar_link }}" target="_blank" rel="noopener noreferrer">Google Scholar</a>.
-=======
-# Feel free to add content and custom Front Matter to this file.
-# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
-
-layout: single
-author_profile: true
-title: "publications"
-permalink: /publications/
----
-
-This is a list of scientific papers to which I have contributed or which were based on my research and ideas.
-Due to my interest in the general principles of deep learning and neural networks, the topics range from deep dives into the inner workings to real-world applications of neural networks.
-Certainly, the latter were influenced by the [projects](/projects) I was involved in and working on.
-Moreover, my colleagues and I were full of excitement, pursuing rather exotic concepts.
-Please see for yourself. :hugs:
->>>>>>> d0fa738f (rebase from mnml mistakes source)
  
 ---
 
@@ -56,12 +39,9 @@ Please see for yourself. :hugs:
     <a href="https://www.mobile.ifi.lmu.de/team/steffen-illium/" style="vertical-align:middle">
     <img src="/assets/images/research/lmu.png" style="margin-bottom: 0em;">LMU</a>
 
-<<<<<<< HEAD
     <a href="https://www.semanticscholar.org/author/Steffen-Illium/51893497" style="vertical-align:middle">
     <img src="/assets/images/research/semschol.png" style="margin-bottom: 0em;">Semantic</a>
 
-=======
->>>>>>> d0fa738f (rebase from mnml mistakes source)
     </figure>
 </center>
 

research.md

@@ -1,10 +1,4 @@
 ---
-<<<<<<< HEAD
-=======
-# Feel free to add content and custom Front Matter to this file.
-# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
-
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 #layout: single
 title: "research"
 permalink: /research/
@@ -14,12 +8,7 @@ author_profile: true
 entries_layout: grid
 ---
 
-<<<<<<< HEAD
 Here you'll find a curated overview of the papers where I have played a pivotal role, either as the first author or as a contributing author further down the authorship line. My involvement has spanned a variety of activities, from conceptualizing the initial ideas and developing machine learning models, to providing support and insights to my colleagues, or rigorously reviewing and refining the work.
-=======
-Here you'll find an overview over the papers in which I am listed either as first author or was involved in the process and listed down the line.
-This ranges from the developing the initial idea, to implementing and tuning machine learning models to help my coleagues or simply discussing and checking on a piece of work.
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 
 ## List of Papers