diff --git a/app/models/resource_label_event.rb b/app/models/resource_label_event.rb
index 1de83c0ac94072985d73d6c3780bfe91ffbf6dd7..06f19bba15c168d3779f6d65208d61a640c6237e 100644
--- a/app/models/resource_label_event.rb
+++ b/app/models/resource_label_event.rb
@@ -3,10 +3,7 @@
 # This model is not used yet, it will be used for:
 # https://gitlab.com/gitlab-org/gitlab-ce/issues/48483
 class ResourceLabelEvent < ActiveRecord::Base
-<<<<<<< HEAD
   prepend EE::ResourceLabelEvent
-=======
->>>>>>> upstream/master
   include Importable
   include Gitlab::Utils::StrongMemoize
   include CacheMarkdownField