fix invalid color bug
fix conflict