git merge conflict indicator error message #931

Job	Run time
Zizmor	18s
Analyze (actions)	42s
Analyze (javascript-typescript)	1m 7s
Analyze (rust)	2m 29s
	4m 36s

Provide feedback