Fix bad merge of server.rb