generating a merge conflict

added front-family to line 2, instead of 3

created a new style called `top20` at the bottom