Resolve lib/api/helpers.rb

lib/api/helpers.rb

@@ -192,14 +192,9 @@ module API
     end
 
     # rubocop: disable CodeReuse/ActiveRecord
-<<<<<<< HEAD
     def find_project_issue(iid, project_id = nil)
       project = project_id ? find_project!(project_id) : user_project
       IssuesFinder.new(current_user, project_id: project.id).find_by!(iid: iid)
-=======
-    def find_project_issue(iid)
-      IssuesFinder.new(current_user, project_id: user_project.id).find_by!(iid: iid)
->>>>>>> upstream/master
     end
     # rubocop: enable CodeReuse/ActiveRecord