add more highlights
fix merge conflicts