resolve the conflicts in search/compare.py