Complain about unresolved merge conflicts #475

Job	Run time
PHP-Linter (8.3) / linter	13s
PHP-Linter (8.5) / linter	10s
PHP-Linter (8.4) / linter	13s
Linter / yaml-linter	5s
Linter / json-linter	29s
Linter / style-linter	0s
Linter / ecmascript-linter	0s
Unit tests, PHP 8.4, ubuntu-latest	28s
Unit tests, PHP 8.4, windows-latest	1m 8s
Unit tests, PHP 8.5, ubuntu-latest	28s
Unit tests, PHP 8.3, ubuntu-latest	39s
Unit tests, PHP 8.5, windows-latest	1m 12s
Unit tests, PHP 8.3, windows-latest	1m 6s
Security checks	-1s
Quality control	-1s
Code coverage	-1s
Cleanup artifacts	-1s
	6m 7s

Provide feedback