The integrator now monitors will-save and did-save notifications, rather than just will-save ones, and will fail a merge if any is detected. This is to handle the scenario where a background save has already begun when the merge method is called.