diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index a77a74eb9d..d78b23ecd0 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -11,6 +11,7 @@
 # six is at 1.12.0, but transifex-client requires ==1.11.0
 # https://github.com/transifex/transifex-client/issues/252
 six==1.11.0
+<<<<<<< HEAD
 
 
 
@@ -32,3 +33,7 @@ splinter==0.9.0
 
 # transifex-client 0.13.5 requires urllib3<1.24, but requests will pull in urllib3==1.24 (https://github.com/transifex/transifex-client/pull/241/files)
 urllib3<1.24
+=======
+# version 2.6.0 changes the data model, which results in a failure in common.djangoapps.util.tests.test_db.MigrationTests.test_migrations_are_in_sync
+django-simple-history==2.5.1
+>>>>>>> Pin django-simple-history until someone verifies that the new version works
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 1a246101af..74dc75943c 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -94,7 +94,7 @@ django-require==1.0.11
 django-rest-swagger==2.2.0
 django-sekizai==0.10.0
 django-ses==0.8.4
-django-simple-history==2.6.0
+django-simple-history==2.5.1
 django-splash==0.2.2
 django-statici18n==1.4.0
 django-storages==1.4.1
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 8715fb05d5..4be59b7ca6 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -113,7 +113,7 @@ django-require==1.0.11
 django-rest-swagger==2.2.0
 django-sekizai==0.10.0
 django-ses==0.8.4
-django-simple-history==2.6.0
+django-simple-history==2.5.1
 django-splash==0.2.2
 django-statici18n==1.4.0
 django-storages==1.4.1
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 118523046f..2896ee724c 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -109,7 +109,7 @@ django-require==1.0.11
 django-rest-swagger==2.2.0
 django-sekizai==0.10.0
 django-ses==0.8.4
-django-simple-history==2.6.0
+django-simple-history==2.5.1
 django-splash==0.2.2
 django-statici18n==1.4.0
 django-storages==1.4.1