PlayerInfo update
merge conflict