fix gemfile.lock conflict