Resolve conflict in app/assets/javascripts/filtered_search/dropdown_user.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/javascripts/filtered_search/dropdown_user.js

@@ -15,11 +15,8 @@ class DropdownUser extends gl.FilteredSearchDropdown {
         params: {
           per_page: 20,
           active: true,
-<<<<<<< HEAD
-=======
           group_id: this.getGroupId(),
           project_id: this.getProjectId(),
->>>>>>> ce-com/master
           current_user: true,
           ...this.projectOrGroupId(),
         },