diff --git a/app/models/user.rb b/app/models/user.rb
index 68e3fb2e5..bbc5d15ac 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -78,14 +78,9 @@ class User < ApplicationRecord
   # 关注
   has_many :be_watchers, foreign_key: :user_id, dependent: :destroy # 我的关注
   has_many :be_watcher_users, through: :be_watchers, dependent: :destroy # 我关注的用户
-<<<<<<< HEAD
   has_many :watchers, as: :watchable, dependent: :destroy
 
   has_one :dev_ops_cloud_account, class_name: 'DevOps::CloudAccount', dependent: :destroy
-=======
-
-  has_many :watchers, as: :watchable, dependent: :destroy
->>>>>>> dev_change_route
 
   # 认证
   has_many :apply_user_authentication