diff --git a/setup.yml b/setup.yml
index 076a5f7a..2c0e197a 100755
--- a/setup.yml
+++ b/setup.yml
@@ -55,8 +55,4 @@
     - matrix-aux
     - matrix-postgres-backup
     - matrix-prometheus-postgres-exporter
-<<<<<<< HEAD
     - matrix-common-after
-=======
-    - matrix-common-after
->>>>>>> upstream/master