Fixed one merge issue, a little whitespace