fix(conflict-resolve) check - #17302

fix(conflict-resolve) check#17302

alperozturk96 wants to merge 3 commits into

masternextcloud/android:masterfrom

fix/is-same-file-on-remotenextcloud/android:fix/is-same-file-on-remoteCopy head branch name to clipboard