diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99222693..8049cba3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,11 +8,7 @@
 
 ## Features
 
-<<<<<<< HEAD
 - Preserve `--diff` change markers and snip separators when `--plain` is set. Closes #3630, see #3643 (@mvanhorn)
-- Add shebang-based detection for Tcl (`tclsh`, `wish`) and Expect (`expect`) scripts, see #3647 (@mvanhorn)
-=======
->>>>>>> 29c913f (test: add shebang regression tests and move changelog to Syntaxes section)
 - Added support for `hidden_file_extensions` from `.sublime-syntax` files, see #3613 (@Matei02355)
 - Add word wrapping mode via `--wrap=word`, see #3597 (@veeceey)
 - Support configuring `--terminal-width` via `BAT_WIDTH`, see #3679 (@officialasishkumar)
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index 9f18f598..432faed8 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -4201,6 +4201,8 @@ fn plain_without_diff_still_works() {
         .assert()
         .success()
         .stdout("line 1\nline 2 modified\nline 3\nline 4 added\n");
+}
+
 #[test]
 fn tcl_shebang_detection_tclsh() {
     bat()
diff --git a/tests/syntax-tests/highlighted/Tcl/expect_shebang b/tests/syntax-tests/highlighted/Tcl/expect_shebang
new file mode 100644
index 00000000..22f2101e
--- /dev/null
+++ b/tests/syntax-tests/highlighted/Tcl/expect_shebang
@@ -0,0 +1,7 @@
+#!/usr/bin/expect -f
+# Expect script detected via expect shebang
+set timeout 30
+spawn ssh user@host
+expect "password:"
+send "secret\r"
+expect eof
diff --git a/tests/syntax-tests/highlighted/Tcl/tclsh_shebang b/tests/syntax-tests/highlighted/Tcl/tclsh_shebang
new file mode 100644
index 00000000..de50978f
--- /dev/null
+++ b/tests/syntax-tests/highlighted/Tcl/tclsh_shebang
@@ -0,0 +1,7 @@
+#!/usr/bin/env tclsh
+# Tcl script detected via tclsh shebang
+puts "Hello from tclsh"
+set x 42
+if {$x > 0} {
+    puts "positive"
+}
diff --git a/tests/syntax-tests/highlighted/Tcl/wish_shebang b/tests/syntax-tests/highlighted/Tcl/wish_shebang
new file mode 100644
index 00000000..134b185d
--- /dev/null
+++ b/tests/syntax-tests/highlighted/Tcl/wish_shebang
@@ -0,0 +1,5 @@
+#!/usr/bin/wish
+# Tk script detected via wish shebang
+package require Tk
+button .b -text "Click" -command {puts "clicked"}
+pack .b