properly merged oleg's units of measure extension
merge