fixed bug where outputs of the form time=1ms were mistakenly treaded as durations at the end of the line, which caused errors.
resolved merge conflict.