Hamed: Dashboard, Reports (except overal report)
Conflict resolved
Conflicts! ~X(