fixes wiki font-size after bad resolved conflicts

in ed93fb982d19efef28d