NSManagedObjectContext+SafeMerge swizzles -mergeChangesFromContextDidSaveNotification and wraps it in a @Try and catch => this isn't nice but sometimes merging fails for no good reason and this catches the exception there -- needed for GoogleMaps 1.2

NSManagedObjectContext+SafeMerge.h

#import <CoreData/CoreData.h>

@interface NSManagedObjectContext (SafeMerge)

@end

NSManagedObjectContext+SafeMerge.mm

#import "NSManagedObjectContext+SafeMerge.h"
#import "NSObject+MethodSwizzle.h" //helpers for swizzeling

@implementation NSManagedObjectContext (SafeMerge)

+ (void)load {
    SEL originalSelector = @selector(mergeChangesFromContextDidSaveNotification:);
    SEL overrideSelector = @selector(mergeChangesFromContextDidSaveNotification_xchg:);
    [self swizzleInstanceMethodWithSelector:originalSelector withSelector:overrideSelector];
}

- (void)mergeChangesFromContextDidSaveNotification_xchg:(NSNotification*)note {
    @try {
        [self mergeChangesFromContextDidSaveNotification_xchg:note]; //swizzled original
    }
    @catch (NSException *exception) {
        NSLog(@"failed to merge, skip: %@", exception);
    }
}

@end