Calls to merge_props should presumably give precedence to overrides, not...

... defaults