resolved conflict in xsearch/main