Conflicts generated seemingly while client offline

Hello folks. I’ve seen a sudden increase in conflicts being reported, which may have coincided with update to windows client 3.6.0. It feels like any files that are edited while this machine is offline will cause a conflict - i.e. not being successfully updated once this machine comes back online - however those same files updated remotely while it is online work just fine. I also have preliminary reports of this condition on the release channel OSX client from another user. Is anyone seeing similar? Noted that the files in question had not been edited on the machine with the conflicts, and indeed had existed there for some time. I’m not using the VFS.