diff --cc spec/node-spec.ts
index 1369b6957e,2f8dd5218d..0000000000
--- a/spec/node-spec.ts
+++ b/spec/node-spec.ts
@@@ -873,7 -873,13 +873,17 @@@ describe('node feature', () => 
        });
      };
  
++<<<<<<< HEAD
 +    process.once('unhandledRejection', () => done('catch block is delayed to next tick'));
++=======
+     let called = false;
+     process.once('unhandledRejection', () => {
+       if (called) return;
+ 
+       done(new Error('catch block is delayed to next tick'));
+       called = true;
+     });
++>>>>>>> fix: webview zoom level persistence on navigation
  
      setTimeout(() => {
        f3().catch(() => done());