showmatches debugged
merge conflict solved