Fix formatting
Merge