[Sprint 61] fix css
[Sprint 61] fix conflict