update typekit, indent
fix merge