Chart Changes
Merge Conflict