fix "trailing whitespace" warnings while applying patch