diff --git a/core/tests.py b/core/tests.py
index 4c1caf13..949601f6 100755
--- a/core/tests.py
+++ b/core/tests.py
@@ -193,7 +193,7 @@ class BookLoaderTests(TestCase):
         self.assertEqual(models.Work.objects.all().count(), before)
 
     def test_missing_isbn(self):
-        e = bookloader.add_by_isbn_from_google('0139391401')
+        e = bookloader.add_by_isbn_from_google('9781938616990') #unassigned in gluejar block
         self.assertEqual(e, None)
 
     def test_thingisbn_mock(self):
diff --git a/payment/tests.py b/payment/tests.py
index 68c6e324..c90e3424 100644
--- a/payment/tests.py
+++ b/payment/tests.py
@@ -20,11 +20,7 @@ from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.core.validators import URLValidator
 from django.test import TestCase
-<<<<<<< HEAD
-=======
-from django.utils import unittest
 from django.utils.timezone import now
->>>>>>> Gluejar/master
 
 """
 regluit imports
diff --git a/requirements_versioned.pip b/requirements_versioned.pip
index 8100fcf5..31d3590e 100644
--- a/requirements_versioned.pip
+++ b/requirements_versioned.pip
@@ -1,4 +1,4 @@
-Django==1.9.13
+Django==1.8.14
 Fabric==1.6.0
 MySQL-python==1.2.5
 Pillow==3.4.2