diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 988c58c93907c7027853184b1f279624e5a566d8..1b8574621efe68cc28d722766e7a6bcd78f489a7 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -11,7 +11,7 @@
 -e git+https://github.com/edx/DoneXBlock.git@2.0.3#egg=done-xblock  # via -r requirements/edx/github.in
 -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme  # via -r requirements/edx/github.in
 -e .  # via -r requirements/edx/local.in
--e git+https://github.com/edx/RateXBlock.git@2.0#egg=rate-xblock  # via -r requirements/edx/github.in
+-e git+https://github.com/edx/RateXBlock.git@2.0.1#egg=rate-xblock  # via -r requirements/edx/github.in
 -e common/lib/safe_lxml  # via -r requirements/edx/local.in
 -e common/lib/sandbox-packages  # via -r requirements/edx/local.in
 -e common/lib/symmath  # via -r requirements/edx/local.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index f95167f47a1da12876f46e45261d4f62e150aa11..b013d2d4469fb7b9dfc17b315b0f3fba713b2a98 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -11,7 +11,7 @@
 -e git+https://github.com/edx/DoneXBlock.git@2.0.3#egg=done-xblock  # via -r requirements/edx/testing.txt
 -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme  # via -r requirements/edx/testing.txt
 -e .  # via -r requirements/edx/testing.txt
--e git+https://github.com/edx/RateXBlock.git@2.0#egg=rate-xblock  # via -r requirements/edx/testing.txt
+-e git+https://github.com/edx/RateXBlock.git@2.0.1#egg=rate-xblock  # via -r requirements/edx/testing.txt
 -e common/lib/safe_lxml  # via -r requirements/edx/testing.txt
 -e common/lib/sandbox-packages  # via -r requirements/edx/testing.txt
 -e common/lib/symmath  # via -r requirements/edx/testing.txt
diff --git a/requirements/edx/github.in b/requirements/edx/github.in
index 8c85318d24fb67dad7e5a4a843be7dbe9561a0fb..089d6b75103dba3718e84c99516465486aadd484 100644
--- a/requirements/edx/github.in
+++ b/requirements/edx/github.in
@@ -59,10 +59,9 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752
 -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
 
 # Our libraries:
-<<<<<<< HEAD
 -e git+https://github.com/edx/codejail.git@ffec49bb09785fb688afc5d24714d4e43ae8449f#egg=codejail==3.0.1
 -e git+https://github.com/edx/acid-block.git@758855a67d2f12bd74db4d5e7a0862d6e65f079c#egg=acid-xblock
--e git+https://github.com/edx/RateXBlock.git@2.0#egg=rate-xblock
+-e git+https://github.com/edx/RateXBlock.git@2.0.1#egg=rate-xblock
 -e git+https://github.com/edx/DoneXBlock.git@2.0.3#egg=done-xblock
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive
 
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index c90ba7302bbfd505f24c16030777e78fdda20e37..d0c2aae963413e36c7c782adbf4c2c990bff7132 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -11,7 +11,7 @@
 -e git+https://github.com/edx/DoneXBlock.git@2.0.3#egg=done-xblock  # via -r requirements/edx/base.txt
 -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme  # via -r requirements/edx/base.txt
 -e .  # via -r requirements/edx/base.txt
--e git+https://github.com/edx/RateXBlock.git@2.0#egg=rate-xblock  # via -r requirements/edx/base.txt
+-e git+https://github.com/edx/RateXBlock.git@2.0.1#egg=rate-xblock  # via -r requirements/edx/base.txt
 -e common/lib/safe_lxml  # via -r requirements/edx/base.txt
 -e common/lib/sandbox-packages  # via -r requirements/edx/base.txt
 -e common/lib/symmath  # via -r requirements/edx/base.txt