diff --git a/requirements/common.txt b/requirements/common.txt
index 7f25f01a44..2f25335a6c 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -1,2 +1,2 @@
-Django==1.11.10
+Django==1.11.11
 -r base.txt
diff --git a/setup.py b/setup.py
index 9977556759..e01014abf9 100644
--- a/setup.py
+++ b/setup.py
@@ -56,8 +56,9 @@ def find_packages(directory):
     return packages
 
 install_requires = """
-Django==1.10.7
-Pillow==4.2.0
+<<<<<<< HEAD
+Django==1.11.11
+Pillow==5.0.0
 PyYAML==3.12
 celery==3.1.24
 cssmin==0.2.0
@@ -91,7 +92,7 @@ python-dateutil==2.5.3
 python-gnupg==0.3.9
 python-magic==0.4.13
 pytz==2016.7
-requests==2.18.4 
+requests==2.18.4
 sh==1.12.11
 """.split()