"Only a one-line conflict in CMakeLists", they said 😄 Turns out it's a ton of manual rebasing and notifications each time. To address this, I generated the whole test case set. For the not-merged-yet tests, it means the same one-time manual rebasing, but should simplify a bit development of the rest of the tests.