Resolve Concelier/Excititor merge conflicts

Mongo2Go-4.1.0/src/Mongo2Go/Helper/MongoDbProcess.IDisposable.cs

@@ -0,0 +1,55 @@
+using System;
+
+namespace Mongo2Go.Helper
+{
+    //  IDisposable and friends
+    public partial class MongoDbProcess
+    {
+        ~MongoDbProcess()
+        {
+            Dispose(false);
+        }
+
+        public bool Disposed { get; private set; }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                // we have no "managed resources" - but we leave this switch to avoid an FxCop CA1801 warnig
+            }
+
+            if (_process == null)
+            {
+                return;
+            }
+
+            if (_process.DoNotKill)
+            {
+                return;
+            }
+
+            if (!_process.HasExited)
+            {
+                _process.Kill();
+                _process.WaitForExit();
+            }
+
+            _process.Dispose();
+            _process = null;
+
+            Disposed = true;
+        }
+    }
+}