what's going on?
resolve merge conflict in omniauth.rb