clang added
clang added 2
merge