Added a check to make sure events have changes before merging. Without this, it was possible for two devices to continuously ping pong back and forth.
Fixed a test for baselines that was failing on iOS due to a side effect creating an extra file.