correct service.yml
correct conflict