btw just FYI for the future you could also just cherry pick my commit and then the other PR would be automatically closed and no conflict could occur.