diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index dca571537..f2ca4cb3b 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,8 +1,2 @@
-# These are supported funding model platforms
-<<<<<<< HEAD
 open_collective: go-kratos
 github: [tonybase]
-=======
-
-github: [go-kratos]
->>>>>>> 2a3c35dfcae14605f930b39cb6ab2f96a6fb945c