try to fix git rebase messin with whitespace problem