Changed the merging delegate methods. The will-save and failed-save methods are now called on background threads, and each passed the saving context and the child reparation context. The delegate can access objects in these contexts using the performBlockAndWait: method. (Blocks should not be nested, because this will cause deadlocks.)