diff --git a/SparkleShare/Mac/SparkleUI.cs b/SparkleShare/Mac/SparkleUI.cs
index c3baa437..84a51047 100644
--- a/SparkleShare/Mac/SparkleUI.cs
+++ b/SparkleShare/Mac/SparkleUI.cs
@@ -123,7 +123,15 @@ namespace SparkleShare {
 				});
 			};
 			
-			
+
+            SparkleShare.Controller.ConflictNotificationRaised += delegate {
+                    string title   = "Ouch! Mid-air collision!";
+                    string subtext = "Don't worry, SparkleShare made a copy of each conflicting file.";
+
+                    new SparkleBubble (title, subtext).Show ();
+            };
+
+
 			SparkleShare.Controller.AvatarFetched += delegate {
 				InvokeOnMainThread (delegate {
 					foreach (SparkleLog log in SparkleUI.OpenLogs)