diff --git a/django/contrib/auth/migrations/0008_alter_user_username_max_length.py b/django/contrib/auth/migrations/0008_alter_user_username_max_length.py
new file mode 100644
index 000000000000..cbc2a0a39db5
--- /dev/null
+++ b/django/contrib/auth/migrations/0008_alter_user_username_max_length.py
@@ -0,0 +1,13 @@
+from django.contrib.auth import validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0007_alter_user_username_max_length'),
+    ]
+
+    operations = [
+        # Dummy migration file to make minimal conflict with upstream.
+    ]