diff --git a/src/Views/ChangeStatusIcon.cs b/src/Views/ChangeStatusIcon.cs
index c1185174..ade46537 100644
--- a/src/Views/ChangeStatusIcon.cs
+++ b/src/Views/ChangeStatusIcon.cs
@@ -126,9 +126,16 @@ namespace SourceGit.Views
                 }
 
                 if (isUnstaged)
-                    ToolTip.SetTip(this, TIPS[(int)c.WorkTree]);
+                {
+                    if (c.IsConflicted)
+                        ToolTip.SetTip(this, $"Conflict ({c.ConflictDesc})");
+                    else
+                        ToolTip.SetTip(this, TIPS[(int)c.WorkTree]);
+                }
                 else
+                {
                     ToolTip.SetTip(this, TIPS[(int)c.Index]);
+                }                    
 
                 InvalidateVisual();
             }