w1m

Results 2 issues of w1m

## Environment - **OS:** Ubuntu 24.10 - **Compiler:** GCC 14 - **Commit:** `b47f6972e66c47f7e17a2e411ce2cac2f2eeb52b` --- ## Steps to Reproduce 1. Create a build directory and configure the project with tests enabled:...

This PR removes residual merge conflict markers (``) accidentally left in the codebase after a previous merge operation. These markers were causing unexpected behavior in the application.