Fix merge issue. Normalize whitespace.