Fix missing merge conflict resolution.
Merge branch '795-delete_repository_asynchonously' into develop