diff --git a/schach/Ressources/Quellen.txt b/schach/Ressources/Quellen.txt
index 2433ef6..d7278c0 100644
--- a/schach/Ressources/Quellen.txt
+++ b/schach/Ressources/Quellen.txt
@@ -9,6 +9,16 @@ PGNs:	   https://chatgpt.com/share/6859a8f1-d3c4-8012-98f4-6ae4b057be73
 
 Eröffnungserkennung: https://github.com/hell-sh/CompactChessOpenings/blob/master/src/sh/hell/compactchess/game/Opening.java
 
+<<<<<<< HEAD
 
 Thomas Müller | 3021788
-Timer    https://chatgpt.com/c/6857ff1e-7ff4-8006-aba3-60d3a2dd59b4
\ No newline at end of file
+Timer    https://chatgpt.com/c/6857ff1e-7ff4-8006-aba3-60d3a2dd59b4
+=======
+Quellen
+
+Justin Muravjev  3014931
+
+ChatGPT:
+https://chatgpt.com/share/685a60b4-dad0-8012-86a8-ca9a7e6eb76b
+
+>>>>>>> branch 'Quellen' of https://gitty.informatik.hs-mannheim.de/3021788/PR2_Schach_Teamprojekt.git