diff --git a/neue file.txt b/neue file.txt
index 6705316..e934f20 100644
--- a/neue file.txt	
+++ b/neue file.txt	
@@ -1 +1 @@
-this is a hotfix
\ No newline at end of file
+this is a hotfix and Das ist ein test für den Conflict aus dem branch conflict
\ No newline at end of file