Fix: add last modified date to the properties
ignore PFRole objects
add serverObjectID to the newerObject
make the lastModificationDate of conflicted objects 10 seconds later and save the updates ascending.