Merge format fix