merge + changed font include order