Before pulling new changes
Fixing merge conflict in Gemfile