Merge formatting fixes