config change
config conflicts fix