fixed the vexing rollover issue
fixed merge conflict that we expected