Bug fix, merge don't update operations dict

The extra parameters to the operations dict should be
merged in, not replaced.

Added unittest to cover this case.