default to use merge, fixes issue #2