fixed currentmax bug
Fixed merge confict and current max fixed