diff --git a/susan.txt b/susan.txt
index d71a5dc..48db0d8 100644
--- a/susan.txt
+++ b/susan.txt
@@ -1,2 +1,2 @@
 Hi I'm Susan! I'm in engineering studying CIS :) I like boba
-merge conflict
\ No newline at end of file
+hi