remove synhilight
fix conflict
Merge branch 'dev'