diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php
index f6913d3f..57fc9539 100644
--- a/phpseclib/Crypt/RSA.php
+++ b/phpseclib/Crypt/RSA.php
@@ -166,7 +166,6 @@ class RSA
     const MODE_OPENSSL = 2;
     /**#@-*/
 
-<<<<<<< HEAD
     /**#@+
      * @access public
      * @see \phpseclib\Crypt\RSA::createKey()