Changed a font size with the expectation to create a merge conflict.