saintbyte
diff --git a/‎telegram/error.py‎
Lines changed: 1 addition & 9 deletions b/‎telegram/error.py‎
Lines changed: 1 addition & 9 deletions
diff --git a/‎telegram/utils/request.py‎
Lines changed: 1 addition & 1 deletion b/‎telegram/utils/request.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/test_error.py‎
Lines changed: 2 additions & 3 deletions b/‎tests/test_error.py‎
Lines changed: 2 additions & 3 deletions
@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU Lesser Public License
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
 """This module contains an object that represents Telegram errors."""
-import re
 
 
 def _lstrip_str(in_s, lstr):
@@ -107,15 +106,8 @@ class Conflict(TelegramError):
 
         Args:
             msg (:obj:`str`): The message from telegrams server.
-            url (:obj:`str`) The url used to make the request. The bot id will be extracted from
-                it if possible.
 
     """
-    def __init__(self, msg, url):
-        # Get the bot token from the URL that was used to make the request
-        # Regex simply searches for id in https://api.telegram.org/botID:TOKEN/method
-        match = re.search(r'bot(\d+):.*/', url)
-        if match:
-            msg += '. Conflicting bot id: {}'.format(match.group(1))
 
+    def __init__(self, msg):
         super(Conflict, self).__init__(msg)
@@ -224,7 +224,7 @@ def _request_wrapper(self, *args, **kwargs):
         elif resp.status == 404:
             raise InvalidToken()
         elif resp.status == 409:
-            raise Conflict(message, args[1])
+            raise Conflict(message)
         elif resp.status == 413:
             raise NetworkError('File too large. Check telegram api limits '
                                'https://core.telegram.org/bots/api#senddocument')
 
@@ -85,6 +85,5 @@ def test_retry_after(self):
             raise RetryAfter(12)
 
     def test_conflict(self):
-        with pytest.raises(Conflict, match=""):
-            raise Conflict('Something something.',
-                           'https://api.telegram.org/bot1234567:ABCABCABCABC/sendMessage')
+        with pytest.raises(Conflict, match='Something something.'):
+            raise Conflict('Something something.')