diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c
index 19a79c1fceb..a3a2587f4b7 100644
--- a/src/backend/backup/basebackup.c
+++ b/src/backend/backup/basebackup.c
@@ -1413,18 +1413,8 @@ sendDir(bbsink *sink, const char *path, int basepathlen, bool sizeonly,
 		}
 
 		/* Allow symbolic links in pg_tblspc only */
-<<<<<<< HEAD
 		snprintf(pathbuf2, MAXPGPATH, "%s/pg_tblspc", is_shared_data ? polar_datadir : ".");
-		if (strcmp(path, pathbuf2) == 0 &&
-#ifndef WIN32
-			S_ISLNK(statbuf.st_mode)
-#else
-			pgwin32_is_junction(pathbuf)
-#endif
-			)
-=======
-		if (strcmp(path, "./pg_tblspc") == 0 && S_ISLNK(statbuf.st_mode))
->>>>>>> REL_15_10
+		if (strcmp(path, pathbuf2) == 0 && S_ISLNK(statbuf.st_mode))
 		{
 #if defined(HAVE_READLINK) || defined(WIN32)
 			char		linkpath[MAXPGPATH];
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index 96a826ee95b..7ac15825488 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -1524,10 +1524,6 @@ void
 ExecHashJoinReInitializeDSM(HashJoinState *state, ParallelContext *cxt)
 {
 	int			plan_node_id = state->js.ps.plan->plan_node_id;
-<<<<<<< HEAD
-	ParallelHashJoinState *pstate =
-		shm_toc_lookup(cxt->toc, plan_node_id, false);
-=======
 	ParallelHashJoinState *pstate;
 
 	/* Nothing to do if we failed to create a DSM segment. */
@@ -1535,7 +1531,6 @@ ExecHashJoinReInitializeDSM(HashJoinState *state, ParallelContext *cxt)
 		return;
 
 	pstate = shm_toc_lookup(cxt->toc, plan_node_id, false);
->>>>>>> REL_15_10
 
 	/*
 	 * It would be possible to reuse the shared hash table in single-batch
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index 4d5c48270d8..356b5590a62 100644
--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@@ -1319,15 +1319,11 @@ llvm_create_object_layer(void *Ctx, LLVMOrcExecutionSessionRef ES, const char *T
 {
 #ifdef USE_LLVM_BACKPORT_SECTION_MEMORY_MANAGER
 	LLVMOrcObjectLayerRef objlayer =
-<<<<<<< HEAD
-		LLVMOrcCreateRTDyldObjectLinkingLayerWithSectionMemoryManager(ES);
-=======
 		LLVMOrcCreateRTDyldObjectLinkingLayerWithSafeSectionMemoryManager(ES);
 #else
 	LLVMOrcObjectLayerRef objlayer =
 		LLVMOrcCreateRTDyldObjectLinkingLayerWithSectionMemoryManager(ES);
 #endif
->>>>>>> REL_15_10
 
 #if defined(HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER) && HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER
 	if (jit_debugging_support)
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index f45e600d88e..de70701465e 100755
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -6688,11 +6688,7 @@ static struct config_string ConfigureNamesString[] =
 
 	{
 		{"restrict_nonsystem_relation_kind", PGC_USERSET, CLIENT_CONN_STATEMENT,
-<<<<<<< HEAD
-			gettext_noop("Sets relation kinds of non-system relation to restrict use."),
-=======
 			gettext_noop("Prohibits access to non-system relations of specified kinds."),
->>>>>>> REL_15_10
 			NULL,
 			GUC_LIST_INPUT | GUC_NOT_IN_SAMPLE
 		},
@@ -10394,9 +10390,9 @@ set_config_option_ext(const char *name, const char *value,
 						(void) set_config_option_ext("role",
 													 value ? "none" : NULL,
 													 orig_context,
-													  (orig_source == PGC_S_OVERRIDE)
-													  ? PGC_S_DYNAMIC_DEFAULT
-													  : orig_source,
+													 (orig_source == PGC_S_OVERRIDE)
+													 ? PGC_S_DYNAMIC_DEFAULT
+													 : orig_source,
 													 orig_srole,
 													 action,
 													 true,
diff --git a/src/test/regress/expected/advisory_lock.out b/src/test/regress/expected/advisory_lock.out
index 2a27d7b6797..bda298df2bf 100644
--- a/src/test/regress/expected/advisory_lock.out
+++ b/src/test/regress/expected/advisory_lock.out
@@ -12,17 +12,12 @@ SELECT
 (1 row)
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -38,14 +33,10 @@ SELECT pg_advisory_unlock_all();
  
 (1 row)
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      4
@@ -66,14 +57,10 @@ WARNING:  you don't own a lock of type ShareLock
 
 -- automatically release xact locks at commit
 COMMIT;
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      0
@@ -90,17 +77,12 @@ SELECT
 (1 row)
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -119,17 +101,12 @@ SELECT
 
 ROLLBACK;
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -153,14 +130,10 @@ WARNING:  you don't own a lock of type ShareLock
  t                  | f                  | t                         | f                         | t                  | f                  | t                         | f
 (1 row)
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      0
@@ -177,17 +150,12 @@ SELECT
 (1 row)
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -206,17 +174,12 @@ SELECT
 
 ROLLBACK;
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -232,14 +195,10 @@ SELECT pg_advisory_unlock_all();
  
 (1 row)
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      0
@@ -258,17 +217,12 @@ SELECT
 (1 row)
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -278,14 +232,10 @@ SELECT locktype, classid, objid, objsubid, mode, granted
 (4 rows)
 
 COMMIT;
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      0
@@ -303,17 +253,12 @@ SELECT
 (1 row)
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -332,14 +277,10 @@ SELECT
  t                  | t                  | t                         | t                         | t                  | t                  | t                         | t
 (1 row)
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      0
@@ -357,17 +298,12 @@ SELECT
 (1 row)
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -382,14 +318,10 @@ SELECT pg_advisory_unlock_all();
  
 (1 row)
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      0
diff --git a/src/test/regress/sql/advisory_lock.sql b/src/test/regress/sql/advisory_lock.sql
index a352af301f2..85f7389a1d1 100644
--- a/src/test/regress/sql/advisory_lock.sql
+++ b/src/test/regress/sql/advisory_lock.sql
@@ -11,30 +11,20 @@ SELECT
 	pg_advisory_xact_lock(1, 1), pg_advisory_xact_lock_shared(2, 2);
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
-
->>>>>>> REL_15_10
 
 -- pg_advisory_unlock_all() shouldn't release xact locks
 SELECT pg_advisory_unlock_all();
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
 
 
 -- can't unlock xact locks
@@ -46,14 +36,10 @@ SELECT
 -- automatically release xact locks at commit
 COMMIT;
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
 
 
 BEGIN;
@@ -64,17 +50,12 @@ SELECT
 	pg_advisory_xact_lock(1, 1), pg_advisory_xact_lock_shared(2, 2);
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
 
 SELECT
 	pg_advisory_lock(1), pg_advisory_lock_shared(2),
@@ -83,17 +64,12 @@ SELECT
 ROLLBACK;
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
 
 
 -- unlocking session locks
@@ -103,14 +79,10 @@ SELECT
 	pg_advisory_unlock(1, 1), pg_advisory_unlock(1, 1),
 	pg_advisory_unlock_shared(2, 2), pg_advisory_unlock_shared(2, 2);
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
 
 
 BEGIN;
@@ -121,17 +93,12 @@ SELECT
 	pg_advisory_lock(1, 1), pg_advisory_lock_shared(2, 2);
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
 
 SELECT
 	pg_advisory_xact_lock(1), pg_advisory_xact_lock_shared(2),
@@ -140,30 +107,21 @@ SELECT
 ROLLBACK;
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
 
 
 -- releasing all session locks
 SELECT pg_advisory_unlock_all();
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
 
 
 BEGIN;
@@ -177,7 +135,6 @@ SELECT
 	pg_advisory_xact_lock_shared(2, 2), pg_advisory_xact_lock_shared(2, 2);
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
@@ -191,14 +148,6 @@ SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
-
-COMMIT;
-
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
 
 -- grabbing session locks multiple times
 
@@ -209,17 +158,12 @@ SELECT
 	pg_advisory_lock_shared(2, 2), pg_advisory_lock_shared(2, 2);
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
 
 SELECT
 	pg_advisory_unlock(1), pg_advisory_unlock(1),
@@ -227,14 +171,10 @@ SELECT
 	pg_advisory_unlock(1, 1), pg_advisory_unlock(1, 1),
 	pg_advisory_unlock_shared(2, 2), pg_advisory_unlock_shared(2, 2);
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
 
 -- .. and releasing them all at once
 
@@ -245,7 +185,6 @@ SELECT
 	pg_advisory_lock_shared(2, 2), pg_advisory_lock_shared(2, 2);
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
@@ -259,11 +198,3 @@ SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
-
-SELECT pg_advisory_unlock_all();
-
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
diff --git a/src/tools/add_commit_links.pl b/src/tools/add_commit_links.pl
index 64a57832972..e04cdd69586 100755
--- a/src/tools/add_commit_links.pl
+++ b/src/tools/add_commit_links.pl
@@ -62,8 +62,9 @@ sub process_file
 
 		# skip over commit links because we will add them below
 		next
-		  if (!$in_comment &&
-			m{^\s*<ulink url="&commit_baseurl;[[:xdigit:]]+">&sect;</ulink>\s*$});
+		  if (!$in_comment
+			&& m{^\s*<ulink url="&commit_baseurl;[[:xdigit:]]+">&sect;</ulink>\s*$}
+		  );
 
 		if ($in_comment && m/\[([[:xdigit:]]+)\]/)
 		{
@@ -73,10 +74,10 @@ sub process_file
 			(!m/^Branch:/) && push(@hashes, $hash);
 
 			# minor release item
-			m/^Branch:/ &&
-			  defined($major_version) &&
-			  m/_${major_version}_/ &&
-			  push(@hashes, $hash);
+			m/^Branch:/
+			  && defined($major_version)
+			  && m/_${major_version}_/
+			  && push(@hashes, $hash);
 		}
 
 		if (!$in_comment && m{</para>})