fixed sinatra routes
merge