diff --git a/beacon_node/src/main.rs b/beacon_node/src/main.rs
index 797217af0..aba44e6fe 100644
--- a/beacon_node/src/main.rs
+++ b/beacon_node/src/main.rs
@@ -182,7 +182,6 @@ fn main() {
                 .takes_value(true),
         )
         /*
-<<<<<<< HEAD
          * The "testnet" sub-command.
          *
          * Allows for creating a new datadir with testnet-specific configs.