diff --git a/preferences/migrations/0030_merge_20180319_0149.py b/preferences/migrations/0030_merge_20180319_0149.py
deleted file mode 100644
index 7330e73a..00000000
--- a/preferences/migrations/0030_merge_20180319_0149.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.7 on 2018-03-19 00:49
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('preferences', '0029_auto_20180318_1005'),
-        ('preferences', '0029_auto_20180318_0213'),
-    ]
-
-    operations = [
-    ]
diff --git a/users/management/commands/chsh.py b/users/management/commands/chsh.py
old mode 100755
new mode 100644