csv report
merging conflict heatmaps activity