Feature: adjust conflict resolution to new behavior#70

infeo merged 4 commits intodesktop/release/1.16.0cryptomator/docs:desktop/release/1.16.0from

feature/new-conflict-resolutioncryptomator/docs:feature/new-conflict-resolutionCopy head branch name to clipboard