[Issue] an unresolved merge conflict in azure.yaml caused a panic

[jfomhover]

• Make sure you've installed the latest version using instructions

Output from azd version
azd version 1.22.0 (commit c9ab0f2)

Describe the bug
I had an unresolved merge conflict in my azure.yaml and I tried azd deploy and it produced this:

To Reproduce
see above

Expected behavior

I'd expect it to issue some yaml parsing error instead?

Environment
Windows, Powershell

[JeffreyCA]

This seems to be caused by #6277 - previously it would display the following error:

Full logs:

2025/12/13 00:35:18 project.go:152: Reading project from file '/workspaces/agent-calc/azure.yaml'
2025/12/13 00:35:18 project.go:152: Reading project from file '/workspaces/agent-calc/azure.yaml'
2025/12/13 00:35:18 middleware.go:102: failed resolving middleware 'hooks' : parsing project file: unable to parse azure.yaml file. Check the format of the file, and also verify you have the latest version of the CLI: yaml: unmarshal errors:
  line 1: cannot unmarshal !!str `<<<<<< ...` into project.ProjectConfig
2025/12/13 00:35:18 middleware.go:112: running middleware 'extensions'

Provisioning Azure resources (azd provision)
Provisioning Azure resources can take some time.

panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x50 pc=0x11377b5]

goroutine 1 [running]:
github.com/azure/azure-dev/cli/azd/pkg/project.(*ImportManager).ServiceStable(0xc000900610, {0x20fc198, 0xc0006ab6b0}, 0x0)
        /workspaces/azure-dev/cli/azd/pkg/project/importer.go:56 +0xb5
github.com/azure/azure-dev/cli/azd/pkg/project.(*projectManager).Initialize(0xc000236540, {0x20fc198, 0xc0006ab6b0}, 0x20ed690?)
        /workspaces/azure-dev/cli/azd/pkg/project/project_manager.go:94 +0x3e
github.com/azure/azure-dev/cli/azd/internal/cmd.(*ProvisionAction).Run(0xc000b16180, {0x20fc198, 0xc0006ab6b0})
        /workspaces/azure-dev/cli/azd/internal/cmd/provision.go:194 +0x248
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*MiddlewareRunner).RunAction.func1({0x20fc198, 0xc0006ab6b0})
        /workspaces/azure-dev/cli/azd/cmd/middleware/middleware.go:130 +0x41f
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*ExtensionsMiddleware).Run(0xc000223980, {0x20fc198, 0xc0006ab6b0}, 0xc0001fcc80)
        /workspaces/azure-dev/cli/azd/cmd/middleware/extensions.go:84 +0x46f
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*MiddlewareRunner).RunAction.func1({0x20fc198, 0xc0006ab6b0})
        /workspaces/azure-dev/cli/azd/cmd/middleware/middleware.go:113 +0x2ae
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*MiddlewareRunner).RunAction.func1({0x20fc198, 0xc0006ab6b0})
        /workspaces/azure-dev/cli/azd/cmd/middleware/middleware.go:109 +0x2d7
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*LoginGuardMiddleware).Run(0xc00052e9f0, {0x20fc198, 0xc0006ab6b0}, 0xc0001fcc80)
        /workspaces/azure-dev/cli/azd/cmd/middleware/login_guard.go:59 +0x89
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*MiddlewareRunner).RunAction.func1({0x20fc198, 0xc0006ab6b0})
        /workspaces/azure-dev/cli/azd/cmd/middleware/middleware.go:113 +0x2ae
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*ErrorMiddleware).Run(0xc000592980, {0x20fc198, 0xc0006ab6b0}, 0xc0001fcc80)
        /workspaces/azure-dev/cli/azd/cmd/middleware/error.go:72 +0x377
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*MiddlewareRunner).RunAction.func1({0x20fc198, 0xc0006ab6b0})
        /workspaces/azure-dev/cli/azd/cmd/middleware/middleware.go:113 +0x2ae
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*TelemetryMiddleware).Run(0xc0007841f0, {0x20fc198, 0xc00039b620}, 0xc0001fcc80)
        /workspaces/azure-dev/cli/azd/cmd/middleware/telemetry.go:88 +0x8e9
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*MiddlewareRunner).RunAction.func1({0x20fc198, 0xc00039b620})
        /workspaces/azure-dev/cli/azd/cmd/middleware/middleware.go:113 +0x2ae
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*UxMiddleware).Run(0xc0002ce040, {0x20fc198, 0xc00039b620}, 0xc0001fcc80)
        /workspaces/azure-dev/cli/azd/cmd/middleware/ux.go:41 +0xb1
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*MiddlewareRunner).RunAction.func1({0x20fc198, 0xc00039b620})
        /workspaces/azure-dev/cli/azd/cmd/middleware/middleware.go:113 +0x2ae
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*DebugMiddleware).Run(0xc0003e40d8, {0x20fc198, 0xc00039b620}, 0xc0001fcc80)
        /workspaces/azure-dev/cli/azd/cmd/middleware/debug.go:51 +0x374
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*MiddlewareRunner).RunAction.func1({0x20fc198, 0xc00039b620})
        /workspaces/azure-dev/cli/azd/cmd/middleware/middleware.go:113 +0x2ae
github.com/azure/azure-dev/cli/azd/cmd/middleware.(*MiddlewareRunner).RunAction(0xc0003055c0, {0x20fc198, 0xc00039b620}, 0xc0001b5650, {0xc0006bd440, 0x14})
        /workspaces/azure-dev/cli/azd/cmd/middleware/middleware.go:134 +0x136
github.com/azure/azure-dev/cli/azd/cmd.(*CobraBuilder).configureActionResolver.func1(0xc000370c08, {0xc0006a53a0, 0x0, 0x1})
        /workspaces/azure-dev/cli/azd/cmd/cobra_builder.go:134 +0x39c
github.com/spf13/cobra.(*Command).execute(0xc000370c08, {0xc0006a5370, 0x1, 0x1})
        /go/pkg/mod/github.com/spf13/cobra@v1.10.1/command.go:1015 +0xb02
github.com/spf13/cobra.(*Command).ExecuteC(0xc00066cf08)
        /go/pkg/mod/github.com/spf13/cobra@v1.10.1/command.go:1148 +0x465
github.com/spf13/cobra.(*Command).Execute(...)
        /go/pkg/mod/github.com/spf13/cobra@v1.10.1/command.go:1071
github.com/spf13/cobra.(*Command).ExecuteContext(...)
        /go/pkg/mod/github.com/spf13/cobra@v1.10.1/command.go:1064
github.com/azure/azure-dev/cli/azd/cmd.ExecuteWithAutoInstall({0x20fc0d0, 0x2e66680}, 0xc0000ca4a0)
        /workspaces/azure-dev/cli/azd/cmd/auto_install.go:298 +0x1e5
main.main()
        /workspaces/azure-dev/cli/azd/main.go:73 +0x252