merge finished

_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)
+
 }