Fix indentation broken by past merges