Updates gemfile
Solving conflicts