diff --git a/file.txt b/file.txt
index d228e96..c319c34 100644
--- a/file.txt
+++ b/file.txt
@@ -1,2 +1,5 @@
-file 1
+file 45433
 editeed
+
+
+This is a file with clonflicting changes