diff --git a/requirements/edx/edx-private.txt b/requirements/edx/edx-private.txt
index 9e19b30730..34999f38ad 100644
--- a/requirements/edx/edx-private.txt
+++ b/requirements/edx/edx-private.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Requirements for edx.org that aren't necessarily needed for Open edX.
 
 -e git+ssh://git@github.com/jazkarta/edX-jsdraw.git@df9d048e331a642193e5aa2e03650fb84a9d715f#egg=edx-jsdraw