diff --git a/setup.yml b/setup.yml
index 4ac807bc..076a5f7a 100755
--- a/setup.yml
+++ b/setup.yml
@@ -1,8 +1,4 @@
 ---
-<<<<<<< HEAD
-# testing changes 2
-=======
->>>>>>> upstream/master
 - name: "Set up a Matrix server"
   hosts: "{{ target if target is defined else 'matrix_servers' }}"
   become: true