Bug Fix Release 1.2

fixes issue #6. Duplicated elements shouldn't appear any longer.
This problem occurred when the same new element is present in both local and remote, but not on base. This typically only happens in advanced merging scenarios.