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

Continue to use NSMergeByPropertyObjectTrumpMergePolicy in every context.  Need to test heavily and try to reproduce the merging.
Merge pull request #1183 from wordpress-mobile/issue/1182-core-data-merge-policy

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