diff --git a/.cruft.json b/.cruft.json
index 21440a8..98ce0b4 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/sunpy/package-template",
-  "commit": "3737aa309d2a695ada046c7868c5683213003f3d",
+  "commit": "c66950b04d0a535002d122c9d5bc0f23534b530c",
   "checkout": null,
   "context": {
     "cookiecutter": {
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 43ffc3e..c09b89e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 repos:
     # This should be before any formatting hooks like isort
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.8.1"
+    rev: "v0.8.2"
     hooks:
       - id: ruff
         args: ["--fix"]
diff --git a/pyproject.toml b/pyproject.toml
index dc1cd39..3abe421 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -85,7 +85,11 @@ write_to = "sunraster/_version.py"
   package = "sunraster"
   filename = "CHANGELOG.rst"
   directory = "changelog/"
+<<<<<<<
   issue_format = "`#{issue} <https://github.com/sunpy/sunraster/pull/{issue}>`__"
+=======
+  issue_format = "`#{issue} <https://github.com/sunpy/radiospectra/pull/{issue}>`__"
+>>>>>>>
   title_format = "{version} ({project_date})"
 
   [[tool.towncrier.type]]