Fixed player class
Merge