Update libreg/inc/libreg/sim.h to remove blank line
Update libreg conv.h/c to merge measurement variables into existing structures