diff --git a/core/admin/mailu/manage.py b/core/admin/mailu/manage.py
index 9732f6f5..3776eb02 100644
--- a/core/admin/mailu/manage.py
+++ b/core/admin/mailu/manage.py
@@ -49,10 +49,14 @@ def advertise():
 @click.argument('domain_name')
 @click.argument('password')
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 25cf8b53 (better help formatting)
 @click.option('-m', '--mode', default='create', metavar='MODE', help='''\b'create' (default): create user. it's an error if user already exists
 'ifmissing': only update password if user is missing
 'update': create user or update password if user exists
 ''')
+<<<<<<< HEAD
 @with_appcontext
 def admin(localpart, domain_name, password, mode):
     """ Create an admin user
@@ -66,6 +70,11 @@ def admin(localpart, domain_name, password, mode):
             - 'ifmissing': if user exists, nothing happens, else it will be created
             - 'update': user is created or, if it exists, its password gets updated
 >>>>>>> b63081cb (display error (not exception) when creating admin)
+=======
+@with_appcontext
+def admin(localpart, domain_name, password, mode):
+    """ Create an admin user
+>>>>>>> 25cf8b53 (better help formatting)
     """
 
     if not mode in ('create', 'update', 'ifmissing'):