Fix the indendation in the last merge