Why am I getting merge conflicts like this?

JonsMergeConflict

<<<<<<< HEAD
<?php
namespace Ipf\Orm;

/**
 * Basic hydrator.
 */
abstract class Hydrator extends \Doctrine\ORM\Internal\Hydration\AbstractHydrator
{
    /**
     * Basic Doctrine object hydrator.
     */
    const TYPE_OBJECT = \Doctrine\ORM\Query::HYDRATE_OBJECT;

    /**
     * Flexible object hydrator. Allows using `key`, 'group' and `collect`.
     */
    const TYPE_FLEXIBLE_OBJECT = 'Ipf\Orm\Hydrator\FlexibleObjectHydrator';

    /**
     * Flexible scalar hydrator. Allows using `key`, 'group' and `collect`.
     */
    const TYPE_SCALAR = 'Ipf\Orm\Hydrator\Scalar';

    /**
     * Query hint for passing hydration parameters.
     */
    const HINT_HYDRATION_PARAMS = 'QUERY_HINT_HYDRATOR_OPTIONS';
=======
<?php
namespace Ipf\Orm;

/**
 * Basic hydrator.
 */
abstract class Hydrator extends \Doctrine\ORM\Internal\Hydration\AbstractHydrator
{
    /**
     * Basic Doctrin object hydrator.
     */
    const TYPE_OBJECT = \Doctrine\ORM\Query::HYDRATE_OBJECT;

    /**
     * Flexible object hydrator. Allows using `key`, 'group' and `collect`.
     */
    const TYPE_FLEXIBLE_OBJECT = 'Ipf\Orm\Hydrator\FlexibleObjectHydrator';

    /**
     * Flexible scalar hydrator. Allows using `key`, 'group' and `collect`.
     */
    const TYPE_SCALAR = 'Ipf\Orm\Hydrator\Scalar';

    /**
     * Query hint for passing hydration parameters.
     */
    const HINT_HYDRATION_PARAMS = 'QUERY_HINT_HYDRATOR_OPTIONS';
>>>>>>> develop
}