add unit connversion
merge comprehensive