Fix merge conflicts in configuration.rst doc