Resolved merge conflicts

platform/commonUI/edit/src/services/DirtyModelCache.js

@@ -32,7 +32,7 @@ define(
         };
 
         DirtyModelCache.prototype.isDirty = function (domainObject) {
-            return !!this.get(domainObject.getId());
+            return !!this.cache[domainObject.getId()];
         };
 
         DirtyModelCache.prototype.markDirty = function (domainObject) {

platform/commonUI/edit/src/services/TransactionService.js

@@ -39,9 +39,8 @@ define(
         }
 
         TransactionService.prototype.startTransaction = function () {
-            if (this.transaction) {
-                throw "Transaction in progress";
-            }
+            if (this.transaction)
+                console.error("Transaction already in progress")
             this.transaction = true;
         };
 
@@ -68,7 +67,7 @@ define(
             }
 
             return this.$q.all(
-                Object.keys(this.cache)
+                Object.keys(cache)
                     .map(keyToObject)
                     .map(objectToPromise))
                 .then(function () {
@@ -93,7 +92,7 @@ define(
             }
 
             function objectToPromise(object) {
-                return object.getCapability('persistence').refresh();
+                return self.$q.when(object.getModel().persisted && object.getCapability('persistence').refresh());
             }
 
             return this.$q.all(Object.keys(cache)