Updated Object.merge to no longer traverse into objects when a resolve
function returns a non-undefined value.