diff --git a/CommitCafe.java b/CommitCafe.java
index 59f3ef7..7b8a357 100644
--- a/CommitCafe.java
+++ b/CommitCafe.java
@@ -3,7 +3,10 @@ public static void main(String[] args) {
         String barista = "nvf";
         int cups = 23;
 
-        System.out.println("nvf brewed 23 cups today.");
-        System.out.println("Keep calm and merge the mocha.");
+        // TODO: Simulate a merge conflict by editing this file.
+        // Replace the println() below with your own message or pun.
+        System.out.println(barista + " brewed " + cups + " cups today and it was amazzzing.");
     }
 }
+
+// Branch for Siyena