diff --git a/team.txt b/team.txt
index dde92a9..b65d64c 100644
--- a/team.txt
+++ b/team.txt
@@ -1,4 +1,8 @@
 Ngb,J. Neugebauer,ngb@helmholtz-bi.de
+Jan,Jan.Landwehrmann,jan.landwehrmann@outlook.de
+=======
 lex.hung, Hung, khachunglexschule@gmail.com
 simon.liebold,Simon Liebold,lieboldsimonpaul@gmail.com
-max.welz,Max Welz,maxwelz11202@gmail.com
\ No newline at end of file
+max.welz,Max Welz,maxwelz11202@gmail.com>>>>>>> 47d3701cadb75f624e7a35d3bb6de936e41506be
+oliver.stankawitz,Oliver Stankawitz,oliver1011@gmx.de
+max.welz,Max Welz,maxwelz11202@gmail.com