c-format merge fix