Fixed indenting after merge