diff --git a/DESCRIPTION b/DESCRIPTION
index ea4053f..4bfe9e3 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,14 +1,6 @@
 Package: sfdep
 Title: Spatial Dependence for Simple Features
-<<<<<<< HEAD
-Version: 0.2.4.9000
-Authors@R: 
-    person(given = "Josiah",
-           family = "Parry",
-           role = c("aut", "cre"),
-           email = "josiah.parry@gmail.com",
-           comment = c(ORCID = "0000-0001-9910-865X"))
-=======
+
 Version: 0.2.4
 Authors@R: c(
     person("Josiah", "Parry", , "josiah.parry@gmail.com", role = c("aut"),
@@ -16,7 +8,7 @@ Authors@R: c(
     person("Dexter", "Locke", 'H', "dexter.locke@gmail.com", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-2704-9720"))
   )
->>>>>>> 1513402d3ad2064a3fa6c425e6c3ce1866f0cdd3
+
 Description: An interface to 'spdep' to integrate with 'sf' objects and the 'tidyverse'.
 License: GPL-3
 URL: https://sfdep.josiahparry.com, https://github.com/josiahparry/sfdep
diff --git a/NEWS.md b/NEWS.md
index ab4e1fa..8d00e7e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,12 +1,13 @@
-# sfdep (development version)
+# sfdep 0.2.5
+
 - updated spacetime_constructor to comply with updates to the cli package. No user-facing changes
+
+# sfdep 0.2.4
+
 - Dexter Locke [@DHLocke] is now the maintainer of sfdep
 - Address failing CRAN checks h/t [@rsbivand](https://github.com/rsbivand) <https://github.com/JosiahParry/sfdep/pull/43>
 - Address bug in local Gi/* statistics
 
-# sfdep 0.2.4
-- CRAN
-
 # sfdep 0.2.3
 
 - remove readr suggestion to pass `noSuggests` from CRAN. Much minuscule tasks for the overlords.