batch-mode merge support
significantly improved merge detection