[GTasks] sync merge (per item)

Having added/changed items on both sides (GTasks and Astrid) causes items loss. (LOSS OF DATA!).
Please implement a per-item sync.
https://github.com/todoroo/astrid/pull/166 might be related.
