Gitea upgrade from X to 1.17.2: merge conflict hangs / merge hangs