groom whitespace artefact from rebase