Fix check conflict logical error
Merge branch 'master' into parser_enhancement