test::a binary file's conflict is settled by keeping one side, then its resolution committed by path

Tests on main · the last 2 runs: 1 passed, 1 failed