fix merge error
fix merge error

doctrine/DoctrineModule,netiul/DoctrineModule,alirezarahmani/DoctrineModule,marek1989/DoctrineModule,inbaz/DoctrineModule,gencer/DoctrineModule,mpalourdio/DoctrineModule,vasildakov/DoctrineModule