merge
add report feature