resolve whitespace conflict