solved merged conflict in omniauth