Merge with main and clang format