add conflict ut

[ssmike]

Changelog entry

Add returning ut for conflicts

Changelog category

• Not for changelog (changelog entry is not required)

Additional information

...

[github-actions]

⚪ 2025-01-09 08:14:05 UTC Pre-commit check linux-x86_64-relwithdebinfo for 9edf3ae has started.
⚪ 2025-01-09 08:14:16 UTC Artifacts will be uploaded here
⚪ 2025-01-09 08:16:38 UTC ya make is running...
🟢 2025-01-09 08:19:01 UTC Tests successful.

Test history | Ya make output | Test bloat

TESTS	PASSED	ERRORS	FAILED	SKIPPED	MUTED?
344	344	0	0	0	0

🟢 2025-01-09 08:19:08 UTC Build successful.

[github-actions]

⚪ 2025-01-09 08:14:19 UTC Pre-commit check linux-x86_64-release-asan for 9edf3ae has started.
⚪ 2025-01-09 08:14:30 UTC Artifacts will be uploaded here
⚪ 2025-01-09 08:16:53 UTC ya make is running...
⚫ 2025-01-09 08:19:47 UTC Check cancelled

[github-actions]

⚪ 2025-01-09 08:22:06 UTC Pre-commit check linux-x86_64-relwithdebinfo for 9823248 has started.
⚪ 2025-01-09 08:22:17 UTC Artifacts will be uploaded here
⚪ 2025-01-09 08:24:39 UTC ya make is running...
🟢 2025-01-09 08:26:54 UTC Tests successful.

Test history | Ya make output | Test bloat

TESTS	PASSED	ERRORS	FAILED	SKIPPED	MUTED?
344	344	0	0	0	0

🟢 2025-01-09 08:27:02 UTC Build successful.

[github-actions]

⚪ 2025-01-09 08:23:48 UTC Pre-commit check linux-x86_64-release-asan for 9823248 has started.
⚪ 2025-01-09 08:24:01 UTC Artifacts will be uploaded here
⚪ 2025-01-09 08:26:29 UTC ya make is running...
🟢 2025-01-09 08:32:40 UTC Tests successful.

Test history | Ya make output | Test bloat

TESTS	PASSED	ERRORS	FAILED	SKIPPED	MUTED?
344	344	0	0	0	0

🟢 2025-01-09 08:32:48 UTC Build successful.