Support single digits where they are word boundaried
merge conflict resolution