Ok - can you deactivate that behavior? Especially on this type of PR that we cherry-pick and rebase, conflicts are problematic, so we we have some I would prefer if they are meaningful. If you edit the text surrounding a line with extra space, it's ok to remove it, but not in parts that you are not altering.