diff --git a/hello world.txt b/hello world.txt
index 876a9ed..5fae20f 100644
--- a/hello world.txt	
+++ b/hello world.txt	
@@ -1 +1,5 @@
-hellhell
+<<<<<<< HEAD
+hell
+=======
+helouu
+>>>>>>> f6b6c3fc3826780f1d04c509881068c51724679c