before merge server sync push merge
Merge branch 'master' of https://github.com/jmgallego/ibid
schedule log and key