scaffold rails app
fix merge conflict