remove trailing whitespace
merged