Continue merging EventStore with CQRS version