misc
fixed merge conflict in Walk._record_step