Fix conflict when a user was reverting the latest patch from someone else

www/common/sframe-app-framework.js

@@ -259,6 +259,9 @@ define([
                 if (content === UNINITIALIZED) { return; }
                 throw new Error("Content must be an object or array, type is " + typeof(content));
             }
+
+            oldContent = content;
+
             if (Array.isArray(content)) {
                 // Pad
                 content.push({ metadata: cpNfInner.metadataMgr.getMetadataLazy() });