modify development.rb
fix merge failed