Made charts
Fixed merged conflicts