diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index 64d24b8a..e41ac1a2 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -509,7 +509,7 @@ namespace SparkleLib.Git {
 
             foreach (string line in lines) {
                 string conflicting_path = line.Substring (3);
-                conflicting_path = conflicting_path.Trim ("\"".ToCharArray ());
+                conflicting_path = this.EnsureSpecialCharacters (conflicting_path);
 
                 SparkleHelpers.DebugInfo ("Git", Name + " | Conflict type: " + line);