Creating rails app
Fixing merge conflict