Fixing merge error on indents.