fixed trailing whitespace
merge