Fixes merge with registerFont