diff --git a/hosts/idols_aquamarine/config.dae b/hosts/idols_aquamarine/config.dae
index c80ff61f..9c32ec1e 100644
--- a/hosts/idols_aquamarine/config.dae
+++ b/hosts/idols_aquamarine/config.dae
@@ -205,11 +205,7 @@ group {
         policy: min_avg10
     }
 
-<<<<<<< HEAD
-    github {
-=======
     ssh-proxy {
->>>>>>> 7aa2276 (fix: dae - github's ssh access)
         filter: name(keyword: 'UK')
         filter: name(keyword: '英国')
         policy: min_avg10