Fix whitespace from merge