diff --git a/SPECS/nfs-ganesha.spec b/SPECS/nfs-ganesha.spec
index 9054515..f51e649 100644
--- a/SPECS/nfs-ganesha.spec
+++ b/SPECS/nfs-ganesha.spec
@@ -878,9 +878,6 @@ exit 0
 %endif
 
 %changelog
-* Wed Dec 22 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-1
-- NFS-Ganesha 4.0 GA
-
 * Fri Nov 18 2022 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.1-1
 - NFS-Ganesha 4.1 GA
 
@@ -890,7 +887,6 @@ exit 0
 * Wed Nov 17 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-0.3rc4
 - NFS-Ganesha 4.0 RC4, w/ utils and gui_utils (python)
 
->>>>>>> origin/c9s-sig-storage-nfs-ganesha-4
 * Wed Nov 17 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 4.0-0.2rc4
 - NFS-Ganesha 4.0 RC4