old_contents: # Copyright 2014 Baidu, Inc.
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
  # except in compliance with the License. You may obtain a copy of the License at
  #
  # http://www.apache.org/licenses/LICENSE-2.0
  #
  # Unless required by applicable law or agreed to in writing, software distributed under the
  # License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  # either express or implied. See the License for the specific language governing permissions
  # and limitations under the License.
  
  """
  The setup script to install BCE SDK for python
  """
  from __future__ import absolute_import
  from builtins import str
  import sys 
  try:
      from setuptools import setup
  except ImportError:
      from distutils.core import setup
  from baidubce import SDK_VERSION
  
  PY3 = sys.version_info[0]==3
  if PY3 and isinstance(SDK_VERSION, bytes):
      SDK_VERSION = SDK_VERSION.decode("utf-8")
  
  setup(
      name='bce-python-sdk',
      version=SDK_VERSION,
      install_requires=['pycrypto>=2.4',
                        'future>=0.6.0',
                        'six>=1.4.0'],
      requires=['pycrypto',
                'future',
                'six'],
      packages=['baidubce',
                'baidubce.auth',
                'baidubce.http',
                'baidubce.retry',
                'baidubce.services',
                'baidubce.services.bos',
                'baidubce.services.sts',
                'baidubce.services.bmr',
                'baidubce.services.dumap',
                'baidubce.services.media',
                'baidubce.services.vcr',
                'baidubce.services.vca',
  #              'baidubce.services.sms',
                'baidubce.services.cdn',
                'baidubce.services.blb',
                'baidubce.services.eip',
                'baidubce.services.route',
                'baidubce.services.subnet',
                'baidubce.services.vpc'
  #              'baidubce.services.cfc',
  #              'baidubce.services.infinite',
  #              'baidubce.services.tsdb'],
      ],
      url='http://bce.baidu.com',
      license='Apache License 2.0',
      author='',
      author_email='',
      description='BCE SDK for python'
  )
  
new_contents: # Copyright 2014 Baidu, Inc.
  #
  # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
  # except in compliance with the License. You may obtain a copy of the License at
  #
  # http://www.apache.org/licenses/LICENSE-2.0
  #
  # Unless required by applicable law or agreed to in writing, software distributed under the
  # License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  # either express or implied. See the License for the specific language governing permissions
  # and limitations under the License.
  
  """
  The setup script to install BCE SDK for python
  """
  from __future__ import absolute_import
  from builtins import str
  import sys 
  try:
      from setuptools import setup
  except ImportError:
      from distutils.core import setup
  from baidubce import SDK_VERSION
  
  PY3 = sys.version_info[0]==3
  if PY3 and isinstance(SDK_VERSION, bytes):
      SDK_VERSION = SDK_VERSION.decode("utf-8")
  
  setup(
      name='bce-python-sdk',
      version=SDK_VERSION,
      install_requires=['pycrypto>=2.4',
                        'future>=0.6.0',
                        'six>=1.4.0'],
      requires=['pycrypto',
                'future',
                'six'],
      packages=['baidubce',
                'baidubce.auth',
                'baidubce.http',
                'baidubce.retry',
                'baidubce.services',
                'baidubce.services.bos',
                'baidubce.services.sts',
                'baidubce.services.bmr',
                'baidubce.services.dumap',
                'baidubce.services.media',
                'baidubce.services.vcr',
                'baidubce.services.vca',
                'baidubce.services.sms',
                'baidubce.services.cdn',
                'baidubce.services.blb',
                'baidubce.services.eip',
                'baidubce.services.route',
                'baidubce.services.subnet',
                'baidubce.services.vpc'
  #              'baidubce.services.cfc',
  #              'baidubce.services.infinite',
  #              'baidubce.services.tsdb'],
      ],
      url='http://bce.baidu.com',
      license='Apache License 2.0',
      author='',
      author_email='',
      description='BCE SDK for python'
  )
  
subject: fix conflict