fix(conflict): resolve quickly with fast sync.#4076

max-nextcloud merged 2 commits intomainnextcloud/text:mainfrom

perf/fast-conflict-resolutionnextcloud/text:perf/fast-conflict-resolutionCopy head branch name to clipboard