rebase from mnml mistakes source

research.md

@@ -1,4 +1,10 @@
 ---
+<<<<<<< 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/
@@ -8,7 +14,12 @@ 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