Actually fixed conflict in xsearch/main