conflict fix
Gemfile.lock fix