[WIP] Fixed #277 - Prevent sync concurrency

can we change this to canSyncUpstream()