Commit .clang-files
Merge version