Gemfile Added
Conflicts with git .. need to merge
Preparing a merge
test.yml changed to contracts_data.yml