localized fonts
Resolve merge conflicts
added conclusion