diff --git a/HW01/mergeconflictfile.txt b/HW01/mergeconflictfile.txt
index 70e2001..512bee3 100644
--- a/HW01/mergeconflictfile.txt
+++ b/HW01/mergeconflictfile.txt
@@ -1,2 +1,3 @@
+changing on a branch...dooodododooo
 oh no!
 I changed a file!