fixing some matcher stuff - allows regex find by unset field + allows find by nil to find by unset fields
merge in and resolve conflist