diff --git a/content/ecs-spot-capacity-providers/modules.md b/content/ecs-spot-capacity-providers/modules.md
index f0f27eec..c69b45ff 100644
--- a/content/ecs-spot-capacity-providers/modules.md
+++ b/content/ecs-spot-capacity-providers/modules.md
@@ -4,10 +4,6 @@ chapter: false
 weight: 13
 ---
 
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/ecs
 This workshop has been broken down into modules.
 
 These modules are designed to be completed in sequence. If you are reading this at a live AWS event, the workshop attendants will give you a high level run down of the labs. Then it’s up to you to follow the instructions below to complete the labs.