diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php
index bf34d2ab..5cdb62d8 100644
--- a/phpseclib/Crypt/RSA.php
+++ b/phpseclib/Crypt/RSA.php
@@ -434,7 +434,12 @@ class RSA extends AsymmetricKey
      * @return bool
      * @access public
      * @param string|RSA|array $key
+<<<<<<< HEAD
      * @param int|bool $type optional
+=======
+     * @param bool|int $type optional
+     * @return bool
+>>>>>>> 2.0
      */
     public function load($key, $type = false)
     {