resolve gemfile lock conflict