parse player
merge conflict