added omniauth initializer
fixed conflicts