ME: replaced instances of 'username = username if username is None else username.lower()' with 'username_iexact'
ME: fixing merge conflicts