Through the beginnings of Sinatra
Resolving merge conflicts