math round
fixed merge conflict