Finalizes git merge conflicts
Fixes responsive typography and layout issues