Reverted MergeChanges flag

* I'm reverting this for the time being while working thru the way the CoreData contexts are supposed to work, and improving the setup.

Signed-off-by: Darren Ehlers <me@darrenehlers.com>