update ol css
update html
resolve conflict