merging - sync func
Merge branch 'master' of github.com:BaobabHealthTrust/dde-server