Reformat code to prevent merge conflicts.