Resolve conflicts in app/models/project.rb

app/models/project.rb

@@ -223,11 +223,8 @@ class Project < ActiveRecord::Base
   has_one :cluster_project, class_name: 'Clusters::Project'
   has_many :clusters, through: :cluster_project, class_name: 'Clusters::Cluster'
   has_many :cluster_ingresses, through: :clusters, source: :application_ingress, class_name: 'Clusters::Applications::Ingress'
-<<<<<<< HEAD
 
   has_many :prometheus_metrics
-=======
->>>>>>> upstream/master
 
   # Container repositories need to remove data from the container registry,
   # which is not managed by the DB. Hence we're still using dependent: :destroy