Pierfrancesco Lombardo provided extensive bug feedback and testing. Blair MacIntyre provided numerous bug fixes and suggestions. Keith Sklower improved the conflict resolution mechanism.