No need to have both import SystemOfUnits as units and from SystemOfUnits import MeV etc.
import SystemOfUnits as units
from SystemOfUnits import MeV
assigned to @wdconinc
enabled an automatic merge when the pipeline for 95d2efe3 succeeds
merged