diff --git a/app/controllers/organizations/team_projects_controller.rb b/app/controllers/organizations/team_projects_controller.rb
index 1af476b83..f221c98db 100644
--- a/app/controllers/organizations/team_projects_controller.rb
+++ b/app/controllers/organizations/team_projects_controller.rb
@@ -11,10 +11,7 @@ class Organizations::TeamProjectsController < Organizations::BaseController
   end
 
   def create
-<<<<<<< HEAD
     tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
-=======
->>>>>>> ceda008... [ADD]组织项目相关
     ActiveRecord::Base.transaction do
       @team_project = TeamProject.build(@organization.id, @team.id, @operate_project.id)
       Gitea::Organization::TeamProject::CreateService.call(@organization.gitea_token, @team.gtid, @organization.login, @operate_project.identifier)
@@ -50,11 +47,7 @@ class Organizations::TeamProjectsController < Organizations::BaseController
   end
 
   def load_operate_project
-<<<<<<< HEAD
     @operate_project = Project.find_by(id: project_mark) || Project.find_by(identifier: project_mark)
-=======
-    @operate_project = Project.find_by(name: params[:id]) || Project.find_by(identifier: params[:id])
->>>>>>> ceda008... [ADD]组织项目相关
     tip_exception("项目不存在") if @operate_project.nil?
   end