fix css merge conflict