merging Gemfile
fix conflict file