merged on sinatra