Fix conflicts for licenses

Author: baobao0206

licenses/LICENSE-postgresql.txt

@@ -1,11 +1,7 @@
 PostgreSQL Database Management System
 (formerly known as Postgres, then as Postgres95)
 
-<<<<<<< HEAD:licenses/LICENSE-postgresql.txt
-Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
-=======
 Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group
->>>>>>> REL_16_9:COPYRIGHT
 
 Portions Copyright (c) 1994, The Regents of the University of California
 
@@ -24,4 +20,4 @@ THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
 ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.