new rails app
resolve conflicts