add two settings for development and production
solve confilcts