The merge strategy `union` should hopefully reduce the number of conflicts when trying to rebase the configuration file, since most of the changes are simple additions anyways.
Christian Duerr