diff --git a/JustOneThing.md b/JustOneThing.md
index 26659fd..5831d2a 100644
--- a/JustOneThing.md
+++ b/JustOneThing.md
@@ -22,3 +22,4 @@
 **Nick**: Why couldn't we get free lunch everyday? :(  
 **Nick**: Test2  
 
+**Hamid**: How does Git merge files? When are changes incompatible?