Merge in the rails app thing