old_contents: """This file is used for pip install"""
  
  from setuptools import setup, find_packages
  from proj_info import SHORT_NAME, VERSION, ABOUT_URL, AUTHOR, LICENSE_TYPE, \
      SHORT_DESCRIPTION, LONG_DESCRIPTION
  
  setup(
      name=SHORT_NAME,
      version=VERSION,
      url=ABOUT_URL,
      license=LICENSE_TYPE,
      author=AUTHOR,
      description=SHORT_DESCRIPTION,
      long_description=LONG_DESCRIPTION,
      packages=find_packages('.'),
      include_package_data=True,
      packages=find_packages(),
      entry_points={
          'console_scripts': [
              'lexos = lexos.application:run'
          ]
      },
      zip_safe=False,
      platforms='any',
      install_requires=[
          'flask',
          'numpy',
          'scikit-learn',
          'scipy',
          'pandas',
          'gensim',
          'beautifulsoup4',
          'lxml',
          'matplotlib',
          'chardet',
          'natsort',
          'plotly'
      ],
      classifiers=[
          'Development Status :: 4 - Beta',
          'Environment :: Web Environment',
          'Intended Audience :: Developers',
          'Intended Audience :: Education',
          'Intended Audience :: Science/Research',
          'License :: OSI Approved :: MIT License',
          'Operating System :: OS Independent',
          'Programming Language :: Python',
          'Programming Language :: Python :: 3.5',
          'Programming Language :: Python :: 3.6',
          'Topic :: Education :: Text Processing :: Utilities'
      ],
      entry_points='''
          [console_scripts]
          lexos=lexos.application:run
      '''
  )
  
new_contents: """This file is used for pip install"""
  
  from setuptools import setup, find_packages
  
  from proj_info import SHORT_NAME, VERSION, ABOUT_URL, AUTHOR, LICENSE_TYPE, \
      SHORT_DESCRIPTION, LONG_DESCRIPTION
  
  setup(
      name=SHORT_NAME,
      version=VERSION,
      url=ABOUT_URL,
      license=LICENSE_TYPE,
      author=AUTHOR,
      description=SHORT_DESCRIPTION,
      long_description=LONG_DESCRIPTION,
      packages=find_packages('.'),
      include_package_data=True,
      zip_safe=False,
      platforms='any',
      install_requires=[
          'flask',
          'numpy',
          'scikit-learn',
          'scipy',
          'pandas',
          'gensim',
          'beautifulsoup4',
          'lxml',
          'matplotlib',
          'chardet',
          'natsort',
          'plotly'
      ],
      classifiers=[
          'Development Status :: 4 - Beta',
          'Environment :: Web Environment',
          'Intended Audience :: Developers',
          'Intended Audience :: Education',
          'Intended Audience :: Science/Research',
          'License :: OSI Approved :: MIT License',
          'Operating System :: OS Independent',
          'Programming Language :: Python',
          'Programming Language :: Python :: 3.5',
          'Programming Language :: Python :: 3.6',
          'Topic :: Education :: Text Processing :: Utilities'
      ],
      entry_points='''
          [console_scripts]
          lexos=lexos.application:run
      '''
  )
  
subject: fix merge error