Minor changes to player scale
resolved gitconflict