^/vendor/clang/dist, resolve conflicts, and update patches.
^/vendor/clang/dist, resolve conflicts, and cleanup patches.