merge new changes about the code, update the report class