Revert "Instead of automerging from disk, always prompt user about disk being different and allow them to apply the changes if they like"

This reverts commit 77338d54e5.

package.json

@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#52b1cd4504",
+        "c9.ide.collab": "#bea1b05bfd",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",