Added merge tool plugin

package.json

@@ -106,7 +106,7 @@
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#e00549cb0f",
-        "c9.ide.scm": "#38d2b48b31",
+        "c9.ide.scm": "#7b44918058",
         "c9.ide.terminal.monitor": "#b76f1c9f24",
         "c9.ide.test": "#d312a01ac6",
         "c9.ide.test.mocha": "#79ff886c04",