soft-fail in case we already have an existing branch with that name
Merge branch 'hotfix/branch-handling'