Resolve conflicts in doc/user/project/labels.md

doc/user/project/labels.md

@@ -78,15 +78,10 @@ Every issue and merge request can be assigned any number of labels. The labels a
 ### Filtering in list pages
 
 From the project issue list page and the project merge request list page, you can [filter](../search/index.md#issues-and-merge-requests) by both group (including subgroup ancestors) labels and project labels.
-<<<<<<< HEAD
 
 From the group issue list page and the group merge request list page, you can [filter](../search/index.md#issues-and-merge-requests) by both group labels (including subgroup ancestors and subgroup descendants) and project labels.
 
 From the group epic list page, you can [filter](../search/index.md#issues-and-merge-requests) by both current group labels as well as decendent group labels.
-=======
-
-From the group issue list page and the group merge request list page, you can [filter](../search/index.md#issues-and-merge-requests) by both group labels (including subgroup ancestors and subgroup descendants) and project labels.
->>>>>>> upstream/master
 
 ![Labels group issues](img/labels_group_issues.png)