Don't increment vector-clock on merge and merge locally. See #3076
Fixes according review. See #3076