fix conflict in Configuration