Resolve locale/gitlab.pot

locale/gitlab.pot

@@ -1531,14 +1531,13 @@ msgstr ""
 msgid "ClusterIntegration|Helm Tiller"
 msgstr ""
 
-<<<<<<< HEAD
+msgid "ClusterIntegration|Hide"
+msgstr ""
+
 msgid "ClusterIntegration|If you are setting up multiple clusters and are using Auto DevOps, %{help_link_start}read this first%{help_link_end}."
 msgstr ""
 
 msgid "ClusterIntegration|In order to show the health of the cluster, we'll need to provision your cluster with Prometheus to collect the required data."
-=======
-msgid "ClusterIntegration|Hide"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "ClusterIntegration|Ingress"