- Fixed merge error and removed unneeded imports in GamePanel