diff --git a/harfbuzz-32/.footprint b/harfbuzz-32/.footprint
index 75ddaaad..22d9a190 100644
--- a/harfbuzz-32/.footprint
+++ b/harfbuzz-32/.footprint
@@ -4,16 +4,6 @@ drwxr-xr-x	root/root	usr/lib32/cmake/
 drwxr-xr-x	root/root	usr/lib32/cmake/harfbuzz/
 -rw-r--r--	root/root	usr/lib32/cmake/harfbuzz/harfbuzz-config.cmake
 lrwxrwxrwx	root/root	usr/lib32/libharfbuzz-gobject.so -> libharfbuzz-gobject.so.0
-<<<<<<< HEAD
-lrwxrwxrwx	root/root	usr/lib32/libharfbuzz-gobject.so.0 -> libharfbuzz-gobject.so.0.40201.0
--rwxr-xr-x	root/root	usr/lib32/libharfbuzz-gobject.so.0.40201.0
-lrwxrwxrwx	root/root	usr/lib32/libharfbuzz-subset.so -> libharfbuzz-subset.so.0
-lrwxrwxrwx	root/root	usr/lib32/libharfbuzz-subset.so.0 -> libharfbuzz-subset.so.0.40201.0
--rwxr-xr-x	root/root	usr/lib32/libharfbuzz-subset.so.0.40201.0
-lrwxrwxrwx	root/root	usr/lib32/libharfbuzz.so -> libharfbuzz.so.0
-lrwxrwxrwx	root/root	usr/lib32/libharfbuzz.so.0 -> libharfbuzz.so.0.40201.0
--rwxr-xr-x	root/root	usr/lib32/libharfbuzz.so.0.40201.0
-=======
 lrwxrwxrwx	root/root	usr/lib32/libharfbuzz-gobject.so.0 -> libharfbuzz-gobject.so.0.40300.0
 -rwxr-xr-x	root/root	usr/lib32/libharfbuzz-gobject.so.0.40300.0
 lrwxrwxrwx	root/root	usr/lib32/libharfbuzz-subset.so -> libharfbuzz-subset.so.0
@@ -22,7 +12,6 @@ lrwxrwxrwx	root/root	usr/lib32/libharfbuzz-subset.so.0 -> libharfbuzz-subset.so.
 lrwxrwxrwx	root/root	usr/lib32/libharfbuzz.so -> libharfbuzz.so.0
 lrwxrwxrwx	root/root	usr/lib32/libharfbuzz.so.0 -> libharfbuzz.so.0.40300.0
 -rwxr-xr-x	root/root	usr/lib32/libharfbuzz.so.0.40300.0
->>>>>>> a240e27 (harfbuzz-32: 4.2.0 -> 4.3.0)
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/harfbuzz-gobject.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/harfbuzz-subset.pc
diff --git a/harfbuzz-32/.signature b/harfbuzz-32/.signature
index 01759609..ae86bb5e 100644
--- a/harfbuzz-32/.signature
+++ b/harfbuzz-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXRNytWwoiCD9lxRXbPChqg6vb9bTLVrFhH1poFgeKrH+ocwwg3rV198oQ0BZlmrF9c9DdB6Epeana3x3/Kbr7As=
+RWSwxGo/zH7eXd5sVwF1ITDYVvQbny5sPmDaMfhFHavmGAcRMmb2QxYdRlafonzMEU/xJA2j0gsZuRiSyPUcuV6eJeOLFfREpwI=
 SHA256 (Pkgfile) = 2c92830982b60859dc246e1de5ed60e798be9dce9c122133c292616d591cb612
-SHA256 (.footprint) = d632b9ac3bd77b9db49dc0f3cd12ef0241ca4d127e4a7dd850689f842e3ac79d
+SHA256 (.footprint) = 71f05e9cdb8489906db7c33ea09b03ba3ee05cccb597d5ad3b6fd67231dbb59b
 SHA256 (harfbuzz-4.3.0.tar.xz) = a49628f4c4c8e6d8df95ef44935a93446cf2e46366915b0e3ca30df21fffb530