Resolve merge conflict in Station.rb