- fix merge issue
- update Gem dependency list