Updated player charts
Merge master conflict