use correct docId in resolveConflict

package.json

@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#b9c2e4bdb8",
         "c9.ide.language.jsonalyzer": "#72954f8da1",
         "c9.ide.language.codeintel": "#4e0a272229",
-        "c9.ide.collab": "#c8cab470b1",
+        "c9.ide.collab": "#48b0eefd02",
         "c9.ide.local": "#9169fec157",
         "c9.ide.find": "#a2dfc3e306",
         "c9.ide.find.infiles": "#488db22ee1",

plugins/c9.ide.watcher/gui.js

@@ -209,7 +209,7 @@ define(function(require, exports, module) {
             }
             
             function resolve() {
-                collab.send({type: "RESOLVE_CONFLICT", data: {path: path}});
+                collab.send({type: "RESOLVE_CONFLICT", data: {docId: path}});
                 resolveConflict(doc, path);
             }