fix Gemfile.lock conflicts