removing typekit refs
conflict fixed