Resolve conflict in locale/gitlab.pot

Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8724

locale/gitlab.pot

@@ -4939,11 +4939,10 @@ msgstr ""
 msgid "Latest changes"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "Learn how to %{no_packages_link_start}publish and share your Maven packages%{no_packages_link_end} with GitLab. Additional package types will be supported in future releases."
-=======
 msgid "Latest pipeline for this branch"
->>>>>>> upstream/master
+msgstr ""
+
+msgid "Learn how to %{no_packages_link_start}publish and share your Maven packages%{no_packages_link_end} with GitLab. Additional package types will be supported in future releases."
 msgstr ""
 
 msgid "Learn more"