If you want to maximize your chances to merge, you might keep all indentation fixes for a followup.