change set-clocks to set_clocks
merge