diff --git a/repository/geregecaotest.yaml b/repository/geregecaotest.yaml
deleted file mode 100644
index 64cb004ea9832c687dc9f47dd6ce8f6518d77251..0000000000000000000000000000000000000000
--- a/repository/geregecaotest.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-- name: kubernetes
-  description: "kubernetes employ and operate"
-  protected_branches:
-  - master
-  type: public
\ No newline at end of file
diff --git a/sig/Container/OWNERS b/sig/Container/OWNERS
index caefccd2b9aa800e5275c62de42cacff9b9671f5..7b69e89b590dc4ac6097fcdec778472ba076d901 100644
--- a/sig/Container/OWNERS
+++ b/sig/Container/OWNERS
@@ -4,7 +4,3 @@ maintainers:
 - duguhaotian
 - jing-rui
 - flyflyflypeng
-<<<<<<< HEAD
-- liuqi469227928
-=======
->>>>>>> 366daf369b82e50ce273bc9b7223f0d525c4b705
diff --git a/sig/DB/OWNERS b/sig/DB/OWNERS
index 305a9a6c8821d7265d7034946b012ce37b223b41..a12503cc3c82535e4afb140111f0312c8d38279a 100644
--- a/sig/DB/OWNERS
+++ b/sig/DB/OWNERS
@@ -3,3 +3,4 @@ maintainers:
 - miao_kaibo
 - jimmy_hero
 - zhuchunyi
+- liuqi469227928
diff --git a/sig/Kernel/OWNERS b/sig/Kernel/OWNERS
index 2738e6c8c346b755f75e61781402cbc7c8cb3eb9..891200e3394e217c4805f7c76c79f6b8483c55da 100644
--- a/sig/Kernel/OWNERS
+++ b/sig/Kernel/OWNERS
@@ -1,4 +1,4 @@
 maintainers:
 - weiyj_lk
 - xiexiuqi
-- yangyingliang
+- yangyingliang
\ No newline at end of file