fix css error
fix conflict