Omniauth with github setup
Fix merge conflict