diff --git a/preferences/migrations/0030_merge_20180319_0149.py b/preferences/migrations/0030_merge_20180320_1419.py
similarity index 85%
rename from preferences/migrations/0030_merge_20180319_0149.py
rename to preferences/migrations/0030_merge_20180320_1419.py
index 7330e73a..90d70370 100644
--- a/preferences/migrations/0030_merge_20180319_0149.py
+++ b/preferences/migrations/0030_merge_20180320_1419.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.7 on 2018-03-19 00:49
+# Generated by Django 1.10.7 on 2018-03-20 13:19
 from __future__ import unicode_literals
 
 from django.db import migrations
diff --git a/users/management/commands/chsh.py b/users/management/commands/chsh.py
old mode 100755
new mode 100644