gemfile lock merge issue