Fix merge error

import android.os.Bundle;

import android.os.Handler;

import android.preference.PreferenceManager;

import com.google.android.material.textfield.TextInputLayout;

import androidx.core.content.ContextCompat;

import androidx.appcompat.app.AppCompatActivity;

import android.text.Editable;

import android.text.TextWatcher;

import android.util.Log;

import android.widget.TextView;

import android.widget.Toast;

import androidx.appcompat.app.AppCompatActivity;

import androidx.core.content.ContextCompat;

import com.google.android.material.snackbar.Snackbar;

import com.google.android.material.textfield.TextInputLayout;

import java.util.Locale;

import java.util.Map;

import androidx.appcompat.app.AppCompatActivity;

import androidx.core.content.ContextCompat;

import at.bitfire.cert4android.CustomCertManager;

import at.bitfire.cert4android.IOnCertificateDecision;

import butterknife.BindView;

import it.niedermann.owncloud.notes.R;

import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;

import it.niedermann.owncloud.notes.persistence.NoteServerSyncHelper;

import it.niedermann.owncloud.notes.util.ExceptionHandler;

import it.niedermann.owncloud.notes.util.NotesClientUtil;

import it.niedermann.owncloud.notes.util.NotesClientUtil.LoginStatus;