diff --git a/Clash/Ruleset/OpenAi.list b/Clash/Ruleset/OpenAi.list
index 5a766f0..f25b793 100644
--- a/Clash/Ruleset/OpenAi.list
+++ b/Clash/Ruleset/OpenAi.list
@@ -1,9 +1,5 @@
 # 内容：OpenAi
-<<<<<<< HEAD
-# 数量：16条
-=======
 # 数量：17条
->>>>>>> master
 DOMAIN-KEYWORD,openai
 DOMAIN,gemini.google.com
 DOMAIN-SUFFIX,auth0.com
@@ -20,5 +16,4 @@ DOMAIN-SUFFIX,oaiusercontent.com
 DOMAIN-SUFFIX,openai.com
 DOMAIN-SUFFIX,openaiapi-site.azureedge.net
 DOMAIN-SUFFIX,sentry.io
-DOMAIN-SUFFIX,stripe.com
-DOMAIN-SUFFIX,chatgpt.com
\ No newline at end of file
+DOMAIN-SUFFIX,stripe.com
\ No newline at end of file