backup on the server
resolve conflicts
Merge branch 'master' of https://github.com/fredfeng/Scuba
Merge branch 'master' of https://github.com/fredfeng/Scuba
Merge branch 'master' of https://github.com/fredfeng/Scuba
Merge branch 'master' of https://github.com/fredfeng/Scuba
Merge branch 'master' of https://github.com/fredfeng/Scuba
Merge branch 'master' of https://github.com/fredfeng/Scuba
Merge branch 'master' of https://github.com/fredfeng/Scuba
Merge branch 'master' of https://github.com/fredfeng/Scuba
Merge branch 'master' of https://github.com/fredfeng/Scuba
Merge branch 'master' of https://github.com/fredfeng/Scuba
resolve on server