Updated PlayerStats
Resolved conflict