Fixed config conflictions