Added a check in the event integrator to make sure the resulting merge event is unique. If it isn’t, it gets deleted.
Updated the handling of timeouts in iCloud again. Fixed issues passing references to __block variables.