Generated the Rails 3 application
Fix merge conflict