diff --git a/.cruft.json b/.cruft.json
index 27e0ae7f719..6d68bbfb4f5 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/sunpy/package-template",
-  "commit": "00b247401fc4660d63583bb44117a84ecd36ae01",
+  "commit": "2fbaccff08fdfbb1bc1eec2bc7b980fe44a718e6",
   "checkout": null,
   "context": {
     "cookiecutter": {
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ed4b9437e42..58e5e2e635e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,11 @@ exclude: ".*(.csv|.fits|.fts|.fit|.header|.txt|tca.*|.json|.asdf)$|^CITATION.rst
 repos:
     # This should be before any formatting hooks like isort
   - repo: https://github.com/astral-sh/ruff-pre-commit
+<<<<<<<
     rev: "v0.4.5"
+=======
+    rev: "v0.5.4"
+>>>>>>>
     hooks:
       - id: ruff
         args: ["--fix"]
diff --git a/pyproject.toml b/pyproject.toml
index e55904f3cc8..4b4dfb773ac 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,11 @@ name = "sunpy"
 description = "SunPy core package: Python for Solar Physics"
 requires-python = ">=3.10"
 readme = { file = "README.rst", content-type = "text/x-rst" }
+<<<<<<<
 license = { file = "LICENSE.rst", content-type = "text/plain" }
+=======
+license = { file = "licenses/LICENSE.rst" }
+>>>>>>>
 authors = [
   { name = "The SunPy Community", email = "sunpy@googlegroups.com" },
 ]
diff --git a/tox.ini b/tox.ini
index d9ea877a01f..949e26afb88 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,12 @@ envlist =
     py312-figure{,-devdeps}
     build_docs{,-gallery}
     base_deps
+<<<<<<<
+=======
+    py{310,311,312}
+    py312-devdeps
+    py310-oldestdeps
+>>>>>>>
     codestyle
     core_deps