diff --git a/Untitled 2 b/Untitled 2
index e361947..0b93106 100644
--- a/Untitled 2	
+++ b/Untitled 2	
@@ -1,2 +1,6 @@
 Hinrik
-Hinrik
\ No newline at end of file
+<<<<<<< HEAD
+Hinrik
+=======
+Tom  Julian Aytacs
+>>>>>>> refs/remotes/origin/Hinrik_Test