Add E2E service BPMNs resolve conflicts