Correct formatter
Merge