change linux font to 15
merge conflict