Refactor syntax unicode merge 6.6.2