Tag: sync conflict handling