Added saving and merging changes from background contexts