diff --git a/app/resources/status.text b/app/resources/status.text
index ccc3bb0..2ad2505 100644
--- a/app/resources/status.text
+++ b/app/resources/status.text
@@ -29,8 +29,12 @@ I thought I saw a statue blink, and a bird with no head, Land on a golden thread
 Solar Sect of Mystic Wisdom
 ~ Nuclear Fusion
 Check out [NEUPINK](https://neupink.bandcamp.com/album/swordflower-hills-killer-2)!
+<<<<<<< HEAD
 I'm a fool, I know nothing / I take the role of a silly clown
 All I do is embrace the wounded soul
 So carry on, love the subhuman self
 Break yourself inside out
-We're just a quirky note in the symphony
\ No newline at end of file
+We're just a quirky note in the symphony
+=======
+So, silent tide / Tell me which face do I show the world / And which one do I hide?
+>>>>>>> main