local
conflict
wait for remote db
Merge branch 'master' of ssh://github.com/xPapers/xPapers
tweak