Merge format fix 2