[stable-3.36] Nmc/1901 Conflict dialog#485

github-actions[bot] wants to merge 1 commit intostable-3.36nextmcloud/android:stable-3.36from

backport/nmc/62/stable-3.36nextmcloud/android:backport/nmc/62/stable-3.36Copy head branch name to clipboard