remove synhilight
fix conflict