Fixed font links
Fixed merge