fixed conflicts in dev and prod env config files