fix: handle non markdown files in conflicts#4220

mejo- merged 5 commits intomainnextcloud/text:mainfrom

fix/4205-text-file-recoverynextcloud/text:fix/4205-text-file-recoveryCopy head branch name to clipboard