# Conflicts:
#	src/common/game_state/player/hand.cpp
#	src/common/game_state/player/player.cpp
#	src/common/game_state/player/player.h