Resolved conflict

Author: Wulian233

Lib/test/test_zipimport.py

@@ -9,7 +9,6 @@
 import time
 import unittest
 import unittest.mock
-import warnings
 
 from test import support
 from test.support import import_helper