Fix race condition between update / sync

[mikesimons]

Given that both sync and update are async operations, if both were to be triggered at the same time and update won out, tasks that had changed remotely earlier but also changed locally would cause more recent local changes to be lost