diff --git a/test/parallel/test-dgram-multicast-set-interface.js b/test/parallel/test-dgram-multicast-set-interface.js
index 6facfdb0af..c065683f53 100644
--- a/test/parallel/test-dgram-multicast-set-interface.js
+++ b/test/parallel/test-dgram-multicast-set-interface.js
@@ -72,18 +72,11 @@ const dgram = require('dgram');
   }));
 }
 
-<<<<<<< HEAD
 // If IPv6 is not supported, skip the rest of the test. However, don't call
 // common.skip(), which calls process.exit() while there is outstanding
 // common.mustCall() activity.
 if (!common.hasIPv6)
   return;
-=======
-if (!common.hasIPv6) {
-  common.skip('Skipping udp6 tests, no IPv6 support.');
-  return;
-}
->>>>>>> 4ae0afb12b... dgram: added setMulticastInterface()
 
 {
   const socket = dgram.createSocket('udp6');