diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 22eeb32..5935e1a 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -1,10 +1,7 @@
 # SPDX-License-Identifier: MPL-2.0
-<<<<<<< HEAD
 # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
 #
 # pages.yml — GitHub Pages deployment via Ddraig SSG.
-=======
->>>>>>> 5c04edd (fix(ci): add missing SPDX header to pages.yml)
 name: GitHub Pages (Ddraig SSG)
 on:
   push: