Pre-merge reformat