all countAllMoney and reset button
minor
resolved merge conflict