Fix indentation after a merge

[ci skip]