gemfile lock merge conflict resolve