Fixes mainManagedObjectContext merge issues