added some dev/prod conflict settings.