match new formatting after merging master