# reduce the number of merge conflicts
doc/whats-new.rst merge=union