diff --git a/packages/accounts-password/passwords_tests_setup.js b/packages/accounts-password/passwords_tests_setup.js
index d174b47793..19b685a48d 100644
--- a/packages/accounts-password/passwords_tests_setup.js
+++ b/packages/accounts-password/passwords_tests_setup.js
@@ -28,11 +28,7 @@ Accounts.onCreateUser(function (options, extra, user) {
 // For now, we just test the one configuration state. You can comment
 // out each configuration option and see that the tests fail.
 Accounts.config({
-<<<<<<< HEAD
   sendConfirmationEmail: true
-=======
-  validateEmails: true
->>>>>>> accounts: introduce accounts-ui configuration, simplify accounts configuration
 });