On Mon, 13 Mar 2023 14:03:12 +0100 Matthieu Baerts wrote: > I don't think there is anything else you can do apart from confirming > the merge resolution looks good to you :) Yup, don't do anything special, we'll resolve based on what Stephen and Matthieu suggest and feed the resolution back to you after your next PR.