Fix Font
fix merger master to local