diff --git a/HW01/mergeconflictfile.txt b/HW01/mergeconflictfile.txt
index f468033..512bee3 100644
--- a/HW01/mergeconflictfile.txt
+++ b/HW01/mergeconflictfile.txt
@@ -1 +1,3 @@
-changing on a branch...dooodododooo
\ No newline at end of file
+changing on a branch...dooodododooo
+oh no!
+I changed a file!