diff --git a/modules/network/nat_pinning_irc/config.yaml b/modules/network/nat_pinning_irc/config.yaml
index 07e50841b..784c7e7be 100644
--- a/modules/network/nat_pinning_irc/config.yaml
+++ b/modules/network/nat_pinning_irc/config.yaml
@@ -19,11 +19,7 @@ beef:
             enable: true
             category: "Network"
             name: "IRC NAT Pinning" 
-<<<<<<< HEAD
             description: "Attempts to open closed ports on statefull firewalls and attempts to create pinholes on NAT-devices.  The firewall/NAT-device must support IRC connection tracking. BeEF will automatically bind a socket on port 6667 (IRC). Then you can connect to the victims public IP on that port.  For more information, please refer to: <a href='http://samy.pl/natpin/'>http://samy.pl/natpin/</a> ."
-=======
-            description: "Attempts to open closed ports on statefull firewalls and attempts to create pinholes on NAT-devices.  The firewall/NAT-device must support IRC connection tracking.  On the attackers side the TCP connection just needs to be accepted (nc -l -p 6667).  Then you can connect to the victims public IP on that port.  For more information, please refer to: <a href='http://samy.pl/natpin/'>http://samy.pl/natpin/</a> ."
->>>>>>> 5a2b29bab46a04c1062119fcff43be416d4fac00
             authors: ["Bart Leppens"]
             target:
                 working: ["FF"]
diff --git a/modules/network/nat_pinning_irc/module.rb b/modules/network/nat_pinning_irc/module.rb
index 65890d517..4a411204a 100644
--- a/modules/network/nat_pinning_irc/module.rb
+++ b/modules/network/nat_pinning_irc/module.rb
@@ -15,9 +15,9 @@
 #
 class Irc_nat_pinning < BeEF::Core::Command
 
-  #def pre_send
-  #  BeEF::Core::NetworkStack::Handlers::AssetHandler.instance.bind_socket("IRC", "0.0.0.0", 6667)
-  #end
+  def pre_send
+    BeEF::Core::NetworkStack::Handlers::AssetHandler.instance.bind_socket("IRC", "0.0.0.0", 6667)
+  end
 
   def self.options
     return [