resolve merge conflicts with clang tot.