Fix merge conflict in org-agenda.el

* lisp/org-agenda.el: Merge conflict due to additional parameters in
  both maint and master resolved.

Needs review!

lisp/org-agenda.el

@@ -4293,11 +4293,7 @@ in `org-agenda-text-search-extra-files'."
 				   ""
 				   (buffer-substring-no-properties
 				    beg1 (point-at-eol))
-<<<<<<< HEAD
-				   level category tags))
-=======
-				   category tags t))
->>>>>>> maint
+				   level category tags t))
 			(org-add-props txt props
 			  'org-marker marker 'org-hd-marker marker
 			  'org-todo-regexp org-todo-regexp
@@ -5017,12 +5013,8 @@ the documentation of `org-diary'."
 	      txt (org-trim
 		   (buffer-substring (match-beginning 2) (match-end 0)))
 	      tags (org-get-tags-at (point))
-<<<<<<< HEAD
 	      level (make-string (org-reduced-level (org-outline-level)) ? )
-	      txt (org-agenda-format-item "" txt level category tags)
-=======
-	      txt (org-agenda-format-item "" txt category tags t)
->>>>>>> maint
+	      txt (org-agenda-format-item "" txt level category tags t)
 	      priority (1+ (org-get-priority txt))
 	      todo-state (org-get-todo-state))
 	(org-add-props txt props
@@ -5202,13 +5194,8 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
 	    (setq head (or (match-string 1) ""))
 	    (setq txt (org-agenda-format-item
 		       (if inactivep org-agenda-inactive-leader nil)
-<<<<<<< HEAD
 		       head level category tags timestr
-		       remove-re)))
-=======
-		       head category tags timestr
 		       remove-re t)))
->>>>>>> maint
 	  (setq priority (org-get-priority txt))
 	  (org-add-props txt props 'priority priority
 			 'org-marker marker 'org-hd-marker hdmarker