Add dynamic bar chart and groupid column to Task table
Resolve merge conflicts