Conflict watcher updated

Assets/GitMerge/Editor/ConflictWatcher.cs

@@ -4,6 +4,8 @@ using System.IO;
 using UnityEditor;
 using UnityEngine;
 
+
+
 namespace GitMerge
 {
     [InitializeOnLoad]