fix font-styles merge conflict
Merge pull request #18 from aspencer8111/alissalikavec-fontStyles

fix font-styles merge conflict