- All unit tests now clean up the new backlog.data and synch.key files.
- merge was playing ping-pong with different undo.data results in a setup with three machines