this commit fixes social connection with merge