add parse_usec
deconflict