corrected whitespace after merge