Basic charts in index view for reports
fix merge conflict