pathologic and spellchecker
merge conflict resolution