forgot to fix merge confict in Gemfile