Removing trailing whitespace from previous merge