Create new rails app
Fix conflicts
Fix conflicts again