The only manual intervention was to remove the merge conflict markers in pybind11.h. TODO in separate commit: complete removal of the obsolete detail/pragma_warning_block.h.