solve conflicts on compositionRoot.js