fix noglobals and the charset '%]' escape sequence
fix merge conflict