merch.css conflict