Create new brach with upstream master

for manage git conflict part we do rebase git think

so we need to create a new main branch on top of upstream master https://github.com/bitfireAT/davx5-ose.git

branch upstream/main-ose - origin/main