diff --git a/gitlab-mode.el b/gitlab-mode.el
index 474c3ed..9b96054 100644
--- a/gitlab-mode.el
+++ b/gitlab-mode.el
@@ -142,7 +142,6 @@ If optional arg BUTTON is non-nil, describe its associated project."
       (user-error "No project here"))))
 
 
->>>>>>> develop
 (defun gitlab-show-projects ()
   "Show Gitlab projects."
   (interactive)