diff --git a/server.yml b/server.yml
index b466899..afc38d4 100644
--- a/server.yml
+++ b/server.yml
@@ -24,10 +24,6 @@
   - tt-rss
   - gitea
   - supysonic
-<<<<<<< HEAD
-  - user_config
-=======
   - chainetv
-
->>>>>>> master
+  - user_config