bar graph and progress graph
merge conflicts