diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index 1911829ac..4d1806787 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -426,11 +426,19 @@ FT_BEGIN_HEADER
 
   typedef struct  T1_Builder_Funcs_
   {
+<<<<<<< psaux.h
     void
     (*init)( T1_Builder*   builder,
              FT_Face       face,
              FT_Size       size,
              FT_GlyphSlot  slot );
+=======
+    void      (*init)( T1_Builder*   builder,
+                       FT_Face       face,
+                       FT_Size       size,
+                       FT_GlyphSlot  slot,
+                       FT_Bool       hinting );
+>>>>>>> 1.14.2.2
 
     void
     (*done)( T1_Builder*   builder );
@@ -531,7 +539,10 @@ FT_BEGIN_HEADER
     FT_Error          error;         /* only used for memory errors */
     FT_Bool           metrics_only;
 
-    T1_Builder_Funcs  funcs;
+    void*             hints_funcs;    /* hinter-specific */
+    void*             hints_globals;  /* hinter-specific */
+
+    T1_Builder_Funcs  funcs;      
   };
 
 
@@ -583,22 +594,20 @@ FT_BEGIN_HEADER
 
   struct  T1_Decoder_Funcs_
   {
-    FT_Error
-    (*init)( T1_Decoder*          decoder,
-             FT_Face              face,
-             FT_Size              size,
-             FT_GlyphSlot         slot,
-             FT_Byte**            glyph_names,
-             T1_Blend*            blend,
-             T1_Decoder_Callback  callback );
+    FT_Error  (*init) ( T1_Decoder*          decoder,
+                        FT_Face              face,
+                        FT_Size              size,
+                        FT_GlyphSlot         slot,
+                        FT_Byte**            glyph_names,
+                        T1_Blend*            blend,
+                        FT_Bool              hinting,
+                        T1_Decoder_Callback  callback );
 
-    void
-    (*done)( T1_Decoder*  decoder );
+    void      (*done) ( T1_Decoder*  decoder );
 
-    FT_Error
-    (*parse_charstrings)( T1_Decoder*  decoder,
-                          FT_Byte*     base,
-                          FT_UInt      len );
+    FT_Error  (*parse_charstrings)( T1_Decoder*  decoder,
+                                    FT_Byte*     base,
+                                    FT_UInt      len );
   };