Fix merge error in ballard.css