Fix indentation issues with last merge