this commit fixes social connection with merge

merge was not working, I fixed it