resolve conflict in general.css