update report
fix conflit