Migrations will broe the custom model auth
Adding method merge
Fix for recent django version and the custom user model and backward compatibility