Delete trailing whitespace for this merge