Conflicts: Manager/RepositoryManager.php Resources/config/mongodb.xml Resources/config/orm.xml Tests/Manager/RepositoryManagerTest.php