diff --git a/lisp/org.el b/lisp/org.el
index 9bb7e2928..2f34aae4a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8,11 +8,7 @@
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: https://orgmode.org
 
-<<<<<<< HEAD
 ;; Version: 9.5-dev
-=======
-;; Version: 9.4.3
->>>>>>> maint
 
 ;; This file is part of GNU Emacs.
 ;;