Updated conflict watcher

Assets/GitMerge/Editor/ConflictWatcher.cs

@@ -4,11 +4,8 @@ using System.IO;
 using UnityEditor;
 using UnityEngine;
 
-
-
 namespace GitMerge
 {
-    [InitializeOnLoad]
     public class ConflictWatcher
 {
     private static FileSystemWatcher watcher;