local env variables working
fix merge conflict in development.rb