Resolve conflicts in kubernetes.rb

app/models/clusters/platforms/kubernetes.rb

@@ -6,11 +6,8 @@ module Clusters
       include Gitlab::Kubernetes
       include ReactiveCaching
       include EnumWithNil
-<<<<<<< HEAD
 
       prepend EE::KubernetesService
-=======
->>>>>>> upstream/master
 
       self.table_name = 'cluster_platforms_kubernetes'
       self.reactive_cache_key = ->(kubernetes) { [kubernetes.class.model_name.singular, kubernetes.id] }