diff --git a/playbooks/openshift-apps/monitor_gating.yml b/playbooks/openshift-apps/monitor_gating.yml
index 00665adeba..ac4e8885a4 100644
--- a/playbooks/openshift-apps/monitor_gating.yml
+++ b/playbooks/openshift-apps/monitor_gating.yml
@@ -20,10 +20,6 @@
     - scoady
     - wwoods
     - zlopez
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 
   - role: rabbit/user
     username: "monitor-gating{{ env_suffix }}"