Fixed Gemfile conflicts

Fixed Gemfile conflicts