diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..a34f884
Binary files /dev/null and b/.DS_Store differ
diff --git a/CommitCafe.java b/CommitCafe.java
index 59f3ef7..f30bc46 100644
--- a/CommitCafe.java
+++ b/CommitCafe.java
@@ -3,7 +3,19 @@ public static void main(String[] args) {
         String barista = "nvf";
         int cups = 23;
 
+
+
+        // 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 + " ??????????? OMG SOMANYCUPS TODAY!!!!!!!");
+
+        System.out.println("nvf brewed 16 cups today.");
+        System.out.println("Commit your coffee, not your code before it compiles.");
+
+
         System.out.println("nvf brewed 23 cups today.");
         System.out.println("Keep calm and merge the mocha.");
     }
 }
+
+// Branch for Richard