old_contents: from setuptools import setup, find_packages
  
  setup(
      name = 'pyIATI',
      version = '0.1.0',
      description = 'Python library representing the IATI Schemas, Codelists and Rulesets',
      author = 'IATI Technical Team and other authors',
      author_email = 'code@iatistandard.org',
      url='http://iatistandard.org/',
      packages = find_packages(exclude='iati/tests'),
      include_package_data = True,
      install_requires = [
          # detecting character encoding of files
          'chardet==3.0.4',
          # JSON schema parsing validation
          'jsonschema==2.6.0',
          # XML handling library
  <<<<<<< HEAD
          'lxml==3.8.0',
          # YAML parsing for validation error codes
          'PyYAML==3.12',
  =======
          'lxml==4.1.0',
  >>>>>>> dev
          # python2/python3 compatibility library
          'six==1.11.0'
          ],
      classifiers = [
          'Development Status :: 2 - Pre-Alpha',
          'Intended Audience :: Developers',
          'License :: OSI Approved :: MIT License',
          'Operating System :: OS Independent',
          'Programming Language :: Python',
          'Programming Language :: Python :: 2.7',
          'Programming Language :: Python :: 3.4',
          'Programming Language :: Python :: 3.5',
          'Programming Language :: Python :: 3.6',
          'Topic :: Scientific/Engineering :: Information Analysis',
          'Topic :: Software Development :: Libraries :: Python Modules',
          'Topic :: Text Processing :: Markup :: XML'
          ],
  )
  
new_contents: from setuptools import setup, find_packages
  
  setup(
      name = 'pyIATI',
      version = '0.1.0',
      description = 'Python library representing the IATI Schemas, Codelists and Rulesets',
      author = 'IATI Technical Team and other authors',
      author_email = 'code@iatistandard.org',
      url='http://iatistandard.org/',
      packages = find_packages(exclude='iati/tests'),
      include_package_data = True,
      install_requires = [
          # detecting character encoding of files
          'chardet==3.0.4',
          # JSON schema parsing validation
          'jsonschema==2.6.0',
          # XML handling library
          'lxml==4.1.0',
          # YAML parsing for validation error codes
          'PyYAML==3.12',
          # python2/python3 compatibility library
          'six==1.11.0'
          ],
      classifiers = [
          'Development Status :: 2 - Pre-Alpha',
          'Intended Audience :: Developers',
          'License :: OSI Approved :: MIT License',
          'Operating System :: OS Independent',
          'Programming Language :: Python',
          'Programming Language :: Python :: 2.7',
          'Programming Language :: Python :: 3.4',
          'Programming Language :: Python :: 3.5',
          'Programming Language :: Python :: 3.6',
          'Topic :: Scientific/Engineering :: Information Analysis',
          'Topic :: Software Development :: Libraries :: Python Modules',
          'Topic :: Text Processing :: Markup :: XML'
          ],
  )
  
subject: Fix conflict in setup.py