Add fuzzy matching
Fix merge