fixed merge issue with Gemfile merge