update new api in baseclient
resolve conflicts after saving conflicted objects
fix tests with new conflict events
_tasks -> [] instead of -> true
merge'