syncclient handles conflict
RRR
Merge branch 'master' of https://github.com/ffhs/privatecloud