Fixed merge for nginx.rb