Resolve conflicts in `locale/gitlab.pot`

locale/gitlab.pot

@@ -2913,11 +2913,10 @@ msgstr ""
 msgid "Files (%{human_size})"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Fill in the fields below, turn on <strong>%{enable_label}</strong>, and press <strong>%{save_changes}</strong>"
-=======
+msgstr ""
+
 msgid "Filter"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Filter by commit message"
@@ -4367,14 +4366,13 @@ msgstr ""
 msgid "No files found."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "No issues for the selected time period."
 msgstr ""
 
-msgid "No merge requests for the selected time period."
-=======
 msgid "No labels with such name or description"
->>>>>>> upstream/master
+msgstr ""
+
+msgid "No merge requests for the selected time period."
 msgstr ""
 
 msgid "No merge requests found"