Cleaned whitespace from merge