first commit
merge fixed
rounding up
merge