wordpress-mobile/WordPress-iOS — pull request #1183 by astralbodies (2014-02-05 18:01:45+00:00)
Title: 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.