Added social auth url
Fixed merge conflict