diff --git a/sql/stacktrace.c b/sql/stacktrace.c
index 838f547dc02..3660ac845fe 100644
--- a/sql/stacktrace.c
+++ b/sql/stacktrace.c
@@ -44,6 +44,7 @@ void safe_print_str(const char* name, const char* val, int max_len)
 }
 
 #ifdef TARGET_OS_LINUX
+/* Force merge conflict, to avoid bk automerge */
 #define SIGRETURN_FRAME_COUNT  2
 
 #if defined(__alpha__) && defined(__GNUC__)
diff --git a/sql/stacktrace.h b/sql/stacktrace.h
index d5d1e05ef0e..7676ee28a83 100644
--- a/sql/stacktrace.h
+++ b/sql/stacktrace.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 #ifdef TARGET_OS_LINUX
-#if defined(HAVE_STACKTRACE) || (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__)))
+#if defined(HAVE_STACKTRACE) || (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) /* Force conflict to avoid bk automerge */
 #undef HAVE_STACKTRACE
 #define HAVE_STACKTRACE