Updated conflict watcher

Assets/GitMerge/Editor/ConflictWatcher.cs

@@ -1,4 +1,4 @@
-// using System;
+using System;
 // using System.Collections.Generic;
 // using System.IO;
 // using UnityEditor;