fix sinatra app
merge