fix conflict
Merge branch 'master' of https://github.com/HirokiDaido/oni_client