css conflict fix
update #1