From cc0805325943376e6560ba74626793f397274c07 Mon Sep 17 00:00:00 2001
From: John Rommel Estropia <rommel.estropia@gmail.com>
Date: Thu, 19 Mar 2015 02:24:28 +0900
Subject: [PATCH] merge in context's queue

---
 HardcoreData/NSManagedObjectContext+Setup.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/HardcoreData/NSManagedObjectContext+Setup.swift b/HardcoreData/NSManagedObjectContext+Setup.swift
index 7953c5a..4cafca3 100644
--- a/HardcoreData/NSManagedObjectContext+Setup.swift
+++ b/HardcoreData/NSManagedObjectContext+Setup.swift
@@ -80,7 +80,10 @@ internal extension NSManagedObjectContext {
             object: rootContext,
             closure: { [weak context] (note) -> Void in
                 
-                context?.mergeChangesFromContextDidSaveNotification(note)
+                context?.performBlockAndWait { () -> Void in
+                    
+                    context?.mergeChangesFromContextDidSaveNotification(note)
+                }
                 return
             }
         )