diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index a2c30b2ebd..21d1f402b0 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -58,7 +58,12 @@ click-log==0.3.2
 click==7.0
 code-annotations==0.3.2
 colorama==0.4.1
+<<<<<<< HEAD
 configparser==4.0.2
+=======
+commonmark==0.9.0         # via recommonmark
+configparser==3.8.1
+>>>>>>> make upgrade
 contextlib2==0.5.5
 cookies==2.2.1
 coreapi==2.3.3
@@ -188,6 +193,7 @@ jmespath==0.9.4
 jsondiff==1.1.1
 jsonfield==2.0.2
 jsonpickle==1.2
+jsonschema==3.0.2
 kombu==3.0.37
 laboratory==1.0.2
 lazy-object-proxy==1.4.2
@@ -197,6 +203,7 @@ libsass==0.10.0
 loremipsum==1.0.5
 git+https://github.com/edx/xblock-lti-consumer.git@v1.1.8#egg=lti_consumer-xblock==1.1.8
 lxml==3.8.0
+m2r==0.2.1
 mailsnake==1.6.4
 mako==1.0.2
 mando==0.6.4
@@ -205,6 +212,7 @@ markey==0.8
 markupsafe==1.1.1
 maxminddb==1.4.1
 mccabe==0.6.1
+mistune==0.8.4            # via m2r
 mock==1.0.1
 modernize==0.7
 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2
@@ -258,6 +266,7 @@ pymongo==2.9.1
 pynliner==0.8.0
 pyparsing==2.2.0
 pyquery==1.4.0
+pyrsistent==0.15.4        # via jsonschema
 pysqlite==2.8.3 ; python_version == "2.7"
 pysrt==1.1.1
 pytest-attrib==0.1.3
@@ -280,6 +289,7 @@ pyuca==1.1
 pyyaml==5.1.2
 radon==3.0.3
 git+https://github.com/edx/RecommenderXBlock.git@1.4.1#egg=recommender-xblock==1.4.1
+recommonmark==0.6.0
 redis==2.10.6
 reportlab==3.5.23
 requests-oauthlib==1.1.0
@@ -309,6 +319,7 @@ sorl-thumbnail==12.3
 sortedcontainers==2.1.0
 soupsieve==1.9.3
 sphinx==1.8.5
+sphinxcontrib-httpdomain==1.7.0
 sphinxcontrib-websupport==1.1.2  # via sphinx
 sqlparse==0.3.0
 staff-graded-xblock==0.5
@@ -349,4 +360,4 @@ xss-utils==0.1.1
 zipp==0.6.0
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.2.0        # via caniusepython3, fs, lazy, pytest, python-levenshtein, sphinx
+# setuptools==41.2.0        # via caniusepython3, fs, jsonschema, lazy, pytest, python-levenshtein, sphinx