Gemfile changed by me
Merge branch 'new_branch'