Indonesia settles Olympics logo row ahead of Asian Games