old_contents: # Copyright (c) Moshe Zadka
  # See LICENSE for details.
  import os
  import subprocess
  import sys
  
  import setuptools
  
  _long_description = '''\
  ncolony_: A wrapper around Twisted process monitor which allows runtime configur
  ation via file-based communication
  
  .. _ncolony: https://ncolony.rtfd.org
  '''
  
  setuptools.setup(
      url='https://github.com/moshez/ncolony',
      classifiers=[
          'Development Status :: 3 - Alpha',
          'Environment :: No Input/Output (Daemon)',
          'Framework :: Twisted',
          'Intended Audience :: System Administrators',
          'License :: OSI Approved :: MIT License',
          'Operating System :: POSIX',
          'Topic :: System',
          'Programming Language :: Python :: 2',
          'Programming Language :: Python :: 2.7',
      ],
      keywords='process monitoring supervisor daemon',
      packages=setuptools.find_packages() + ['twisted.plugins'],
      install_requires=['Twisted', 'mainland', 'incremental', 'six'],
      setup_requires=['incremental'],
      use_incremental=True,
      **module.metadata
  )
  
new_contents: # Copyright (c) Moshe Zadka
  # See LICENSE for details.
  import os
  import subprocess
  import sys
  
  import setuptools
  
  import ncolony as module
  
  setuptools.setup(
      url='https://github.com/moshez/ncolony',
      classifiers=[
          'Development Status :: 3 - Alpha',
          'Environment :: No Input/Output (Daemon)',
          'Framework :: Twisted',
          'Intended Audience :: System Administrators',
          'License :: OSI Approved :: MIT License',
          'Operating System :: POSIX',
          'Topic :: System',
          'Programming Language :: Python :: 2',
          'Programming Language :: Python :: 2.7',
      ],
      keywords='process monitoring supervisor daemon',
      packages=setuptools.find_packages() + ['twisted.plugins'],
      install_requires=['Twisted', 'mainland', 'incremental', 'six'],
      setup_requires=['incremental'],
      use_incremental=True,
      **module.metadata
  )
  
subject: fix merge problems