fix merge conflicts and Sphinxsearch reference