<?xml version="1.0" ?>
<container xmlns="http://symfony.com/schema/dic/services"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
    <parameters>
        <parameter key="phpspec2.magento.bootstrap">PHPSpec2\Magento\Bootstrap</parameter>
        <parameter key="phpspec2.magento.bootstrap.app">PHPSpec2\Magento\Bootstrap\App</parameter>
    </parameters>
    <services>
        <service id="phpspec2.magento.bootstrap.app" class="%phpspec2.magento.bootstrap.app%" />
        <service id="mage" class="%phpspec2.magento.bootstrap%" >
            <argument type="service" id="phpspec2.magento.bootstrap.app" />
        </service>
    </services>
</container>

Fix git conflict in composer.json
Fix git conflict in composer.json
