fixed highlighting error
Merge branch 'master-master'