Remove conflict in configuration.yaml