fix line-height
fix conflict