fix gemfile merge conflict