Generated the Rails 3 application
fix merge conflict