changed charts
conflict resolved