add report icon
Merge conflict