Set the merge policy to not throw an error if there is a conflict

Fixes #1182 

Continue to use NSMergeByPropertyObjectTrumpMergePolicy in every context.  Need to test heavily and try to reproduce the merging.