implemented gamePanel
fixed conflict