resolve
resolve conflict
Merge branch 'master' of https://github.com/fredfeng/Scuba