add typekit
merge conflict