Game: add comented out not working get_player_to_shoot_its_board method
fix merge conflicts