some tweaks for Seattle.rb
fixed conflict