Remove Katie font-family
Remove Katie testing font
Merge conflict resolve
Merge conflict resolve