fixing some merge problems
let one-slack ssvm keep track of time