Generate the Rails 4 application
Resolve conflicts