main held only the data race and test timeout fix, which next already has as 915f56e, so every conflict is resolved to next's version and the merge changes no file. Model: opus-5-5
915f56e