update gemfile defined
merges fixed