oops, looks like the stuff in app.rb got reintroduced in the merge.  that's probably what the conflict was about