Merge "Add .clang-format" into main