diff --git a/vendor/mpdf/psr-http-message-shim/src/Uri.php b/vendor/mpdf/psr-http-message-shim/src/Uri.php
index c376d658..d7f4074f 100644
--- a/vendor/mpdf/psr-http-message-shim/src/Uri.php
+++ b/vendor/mpdf/psr-http-message-shim/src/Uri.php
@@ -265,11 +265,7 @@ final class Uri implements UriInterface
 		return !isset(self::$schemes[$scheme]) || $port !== self::$schemes[$scheme];
 	}
 
-<<<<<<< HEAD
-	private function filterPort(int $port): ?bool
-=======
 	private function filterPort(int $port): ?int
->>>>>>> 097faaa6cdcfaa51b2861ff317b6deb027bec7bf
 	{
 		if (null === $port) {
 			return null;