fix conflicts

app/src/main/java/com/example/yourcashiertest/activities/RegisterActivity.java

@@ -46,8 +46,6 @@ public class RegisterActivity extends AppCompatActivity {
                 user.setPassword(binding.etPassword.getText().toString());
                 user.setPhoneNumber(binding.etPhoneNumber.getText().toString());
                 viewModel.registrasi(user);
-
-                Toast.makeText(getApplicationContext(), viewModel.getMessages(), Toast.LENGTH_LONG).show();
                 startActivity(new Intent(getApplicationContext(), LoginActivity.class));
                 finish();
             }