simple text size and all caps to demo merge conflict

demoing merge conflict and pull request