diff --git a/pom.xml b/pom.xml
index cd00746..3c27aad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,11 +65,7 @@
     <maven.compiler.source>${javac.src.version}</maven.compiler.source>
     <maven.compiler.target>${javac.target.version}</maven.compiler.target>
 
-<<<<<<< HEAD
     <project.build.outputTimestamp>2023-03-18T19:46:34Z</project.build.outputTimestamp>
-=======
-    <project.build.outputTimestamp>2024-02-27T00:41:47Z</project.build.outputTimestamp>
->>>>>>> 2.17
   </properties>
 
   <!-- Alas, need to include snapshot reference since otherwise can not find
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 45b3027..363d832 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -10,7 +10,11 @@ The parent pom for various Jackson components.
 
 Not yet released
 
-2.17 (not yet released)
+2.18 (not yet released)
+
+-
+
+2.17 (12-Mar-2023)
 
 - Update to oss-parent 58 (plugin version updates)