add FuzzyFinder plugin
modify conflicts