diff --git a/hello.txt b/hello.txt
index 5c81db30ca3a8ccb2dc6babffac47bdf2b48979b..4884e2cdeb2225535c482913543d99febc3bf7af 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 open source
+=======
+hello babies, girls, boys.
+>>>>>>> 0e05e8325dc5ffc042cd4cf25d2f50add831bf5e