diff --git a/HW01/mergeconflictfile.txt b/HW01/mergeconflictfile.txt
index 14493c5..70e2001 100644
--- a/HW01/mergeconflictfile.txt
+++ b/HW01/mergeconflictfile.txt
@@ -1,2 +1,2 @@
-this is some text...yippie
-bottom text
+oh no!
+I changed a file!