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