resolve conflict

docs/zh_CN/conf.py

@@ -11,7 +11,6 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
-# import sys
 import recommonmark
 
 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']