added sync2
ack-mode
conflict resolution isn't working, temporary fix