Backup - recory try 1
Fix player name offset
Fix conflicts