conflict markers, but it actually changes nothing.
We've been running this code with small changes for some time, this may
be useful for checking what those changes. It was unfortunate this
module got so far away from the vendor branch (whitespace changes didn't
help)