Add Gemfile
Add source to Gemfile
Resolve merge conflict