fixed some merging problems and disable non-existent cache service

src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml

@@ -50,7 +50,9 @@
         </service>
 
         <service id="doctrine.orm.metadata_driver.annotation.reader" class="Doctrine\Common\Annotations\AnnotationReader">
+<!--
             <argument type="service" id="doctrine.orm.cache" />
+//-->
             <call method="setDefaultAnnotationNamespace"><argument>Doctrine\ORM\Mapping\</argument></call>
         </service>
 

src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/MongoDBExtension.php

@@ -111,11 +111,6 @@ class MongoDBExtension extends Extension
         }
     }
 
-<<<<<<< HEAD
-        foreach (array('host', 'port', 'database') as $key) {
-            if (isset($config[$key])) {
-                $container->setParameter('doctrine.odm.mongodb.default_'.$key, $config[$key]);
-=======
     /**
      * Loads a document manager configuration.
      *
@@ -179,7 +174,6 @@ class MongoDBExtension extends Extension
             }
             foreach ($configDocumentManagers as $name => $documentManager) {
                 $documentManagers[isset($documentManager['id']) ? $documentManager['id'] : $name] = $documentManager;
->>>>>>> fe46b02... [DoctrineMongoDBBundle] Finishing implementation of DoctrineMongoDBBundle to support multiple connections/document managers plus refactoring and cleaning up code along the way.
             }
         } else {
             $documentManagers = array($defaultDocumentManager => $config);