rails app
merged