fileho wrote: Hi @michaelrj-google, I have resolved the conflicts and removed extra whitespace which I had accidentally added during the previous resovle. Should be ready for merge when all checks pass https://github.com/llvm/llvm-project/pull/185269